From d2f2203c3385e6c5c0cb1a9a1ae6552e987ef819 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sat, 15 Oct 2011 23:17:55 -0400
Subject: [PATCH] fixes #134: Appeal option missing

---
 app/assets/javascripts/post_appeals.js                | 4 ++--
 app/assets/stylesheets/specific/post_appeals.css.scss | 5 +++++
 app/models/post_appeal.rb                             | 2 +-
 app/views/post_appeals/create.js.erb                  | 6 +++---
 app/views/posts/partials/show/_notices.html.erb       | 2 +-
 app/views/posts/show.html.erb                         | 1 +
 config/locales/en.yml                                 | 3 +++
 7 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/stylesheets/specific/post_appeals.css.scss

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 @@
   </div>
 <% end %>
 
-<% if post.is_deleted? && post.appeals.any? %>
+<% if post.appeals.any? %>
   <div class="ui-corner-all ui-state-highlight notice">
     <span class="ui-icon ui-icon-info"></span>
     This post has been appealed: <%= post_appeal_reasons(post) %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index f5375b5ef..709006705 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -91,6 +91,7 @@
   <meta name="post-id" content="<%= @post.id %>">
   <meta name="post-is-approvable" content="<%= @post.is_approvable? %>">
   <meta name="post-is-deleted" content="<%= @post.is_deleted? %>">
+  <meta name="post-is-flagged" content="<%= @post.is_flagged? %>">
   <meta name="config-medium-width" content="<%= Danbooru.config.medium_image_width %>">
   <meta name="config-large-width" content="<%= Danbooru.config.large_image_width %>">
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a1e5d0979..235992646 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -11,3 +11,6 @@ en:
       post_vote:
         user: "You"
         user_id: "You"
+      post_appeal:
+        creator: "You"
+        creator_id: "You"