diff --git a/app/assets/javascripts/post_appeals.js b/app/assets/javascripts/post_appeals.js index 6f7e34f63..74f6bf9a2 100644 --- a/app/assets/javascripts/post_appeals.js +++ b/app/assets/javascripts/post_appeals.js @@ -7,8 +7,8 @@ } Danbooru.PostAppeal.hide_or_show_appeal_link = function() { - if (Danbooru.meta("post-is-deleted") != "true") { - $("a#appeal").hide(); + if (Danbooru.meta("post-is-flagged") !== "true") { + $("#c-posts #appeal").hide(); } } diff --git a/app/assets/stylesheets/specific/post_appeals.css.scss b/app/assets/stylesheets/specific/post_appeals.css.scss new file mode 100644 index 000000000..dc806b714 --- /dev/null +++ b/app/assets/stylesheets/specific/post_appeals.css.scss @@ -0,0 +1,5 @@ +div#c-post-appeals { + li { + list-style-type: disc; + } +} \ No newline at end of file diff --git a/app/models/post_appeal.rb b/app/models/post_appeal.rb index 3d74cb879..68675422f 100644 --- a/app/models/post_appeal.rb +++ b/app/models/post_appeal.rb @@ -7,7 +7,7 @@ class PostAppeal < ActiveRecord::Base validate :validate_post_is_inactive validate :validate_creator_is_not_limited before_validation :initialize_creator, :on => :create - validates_uniqueness_of :creator_id, :scope => :post_id, :message => "has already appealed this post" + validates_uniqueness_of :creator_id, :scope => :post_id, :message => "have already appealed this post" scope :for_user, lambda {|user_id| where(["creator_id = ?", user_id])} scope :recent, lambda {where(["created_at >= ?", 1.day.ago])} diff --git a/app/views/post_appeals/create.js.erb b/app/views/post_appeals/create.js.erb index 8749bf830..4b9265490 100644 --- a/app/views/post_appeals/create.js.erb +++ b/app/views/post_appeals/create.js.erb @@ -1,6 +1,6 @@ -var errors = <%= @post_appeal.errors.full_messages.to_json.html_safe %>; +var errors = "<%= j @post_appeal.errors.full_messages.join("; ") %>"; if (errors.length > 0) { - Danbooru.j_error(errors.join("; ")); + Danbooru.j_error(errors); } else { - Danbooru.j_alert("Appeal", "Post appeal"); + Danbooru.j_alert("Appeal", "Post appealed"); } diff --git a/app/views/posts/partials/show/_notices.html.erb b/app/views/posts/partials/show/_notices.html.erb index e311af82d..05104e3d1 100644 --- a/app/views/posts/partials/show/_notices.html.erb +++ b/app/views/posts/partials/show/_notices.html.erb @@ -5,7 +5,7 @@ <% end %> -<% if post.is_deleted? && post.appeals.any? %> +<% if post.appeals.any? %>