jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When merging artcomms, list source as html page url, not image url.

Browse Source
This commit is contained in:
evazion
2017-03-16 18:02:05 -05:00
parent d9a26975ba
commit 2051981170
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/artist_commentaries.js
View File

@@ -115,10 +115,12 @@
// If the new description conflicts with the current description, merge them // If the new description conflicts with the current description, merge them
// by appending the new description onto the old one. // by appending the new description onto the old one.
Danbooru.ArtistCommentary.merge_commentaries = function(description, commentary) { Danbooru.ArtistCommentary.merge_commentaries = function(description, commentary) {
var normalized_source = $("#image-container").data().normalizedSource;
if ((commentary.original_description && description) && if ((commentary.original_description && description) &&
(commentary.original_description != description)) { (commentary.original_description != description)) {
return description return description
+ "\n\n[tn]\nSource: " + $("#post_source").val() + "\n[/tn]" + "\n\n[tn]\nSource: " + normalized_source + "\n[/tn]"
+ "\n\nh6. " + (commentary.original_title || "Untitled") + "\n\nh6. " + (commentary.original_title || "Untitled")
+ "\n\n" + commentary.original_description + "\n\n" + commentary.original_description
+ "\n\n[tn]\nSource: " + commentary.source + "\n[/tn]"; + "\n\n[tn]\nSource: " + commentary.source + "\n[/tn]";

2
app/presenters/post_presenter.rb
View File

@@ -88,6 +88,8 @@ class PostPresenter < Presenter
data-file-url="#{post.file_url}" data-file-url="#{post.file_url}"
data-large-file-url="#{post.large_file_url}" data-large-file-url="#{post.large_file_url}"
data-preview-file-url="#{post.preview_file_url}" data-preview-file-url="#{post.preview_file_url}"
data-source="#{post.source}"
data-normalized-source="#{post.normalized_source}"
}.html_safe }.html_safe
end end