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

fixes #134: Appeal option missing

Browse Source
This commit is contained in:
albert
2011-10-15 23:17:55 -04:00
parent 75df5dc1b3
commit d2f2203c33
7 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,8 +7,8 @@
} }
Danbooru.PostAppeal.hide_or_show_appeal_link = function() { Danbooru.PostAppeal.hide_or_show_appeal_link = function() {
if (Danbooru.meta("post-is-deleted") != "true") { if (Danbooru.meta("post-is-flagged") !== "true") {
$("a#appeal").hide(); $("#c-posts #appeal").hide();
} }
} }

5
app/assets/stylesheets/specific/post_appeals.css.scss Normal file
View File

@@ -0,0 +1,5 @@
div#c-post-appeals {
li {
list-style-type: disc;
}
}

2
app/models/post_appeal.rb
View File

@@ -7,7 +7,7 @@ class PostAppeal < ActiveRecord::Base
validate :validate_post_is_inactive validate :validate_post_is_inactive
validate :validate_creator_is_not_limited validate :validate_creator_is_not_limited
before_validation :initialize_creator, :on => :create 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 :for_user, lambda {|user_id| where(["creator_id = ?", user_id])}
scope :recent, lambda {where(["created_at >= ?", 1.day.ago])} scope :recent, lambda {where(["created_at >= ?", 1.day.ago])}

6
app/views/post_appeals/create.js.erb
View File

@@ -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) { if (errors.length > 0) {
Danbooru.j_error(errors.join("; ")); Danbooru.j_error(errors);
} else { } else {
Danbooru.j_alert("Appeal", "Post appeal"); Danbooru.j_alert("Appeal", "Post appealed");
} }

2
app/views/posts/partials/show/_notices.html.erb
View File

@@ -5,7 +5,7 @@
</div> </div>
<% end %> <% end %>
<% if post.is_deleted? && post.appeals.any? %> <% if post.appeals.any? %>
<div class="ui-corner-all ui-state-highlight notice"> <div class="ui-corner-all ui-state-highlight notice">
<span class="ui-icon ui-icon-info"></span> <span class="ui-icon ui-icon-info"></span>
This post has been appealed: <%= post_appeal_reasons(post) %> This post has been appealed: <%= post_appeal_reasons(post) %>

1
app/views/posts/show.html.erb
View File

@@ -91,6 +91,7 @@
<meta name="post-id" content="<%= @post.id %>"> <meta name="post-id" content="<%= @post.id %>">
<meta name="post-is-approvable" content="<%= @post.is_approvable? %>"> <meta name="post-is-approvable" content="<%= @post.is_approvable? %>">
<meta name="post-is-deleted" content="<%= @post.is_deleted? %>"> <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-medium-width" content="<%= Danbooru.config.medium_image_width %>">
<meta name="config-large-width" content="<%= Danbooru.config.large_image_width %>"> <meta name="config-large-width" content="<%= Danbooru.config.large_image_width %>">
<% end %> <% end %>

3
config/locales/en.yml
View File

@@ -11,3 +11,6 @@ en:
post_vote: post_vote:
user: "You" user: "You"
user_id: "You" user_id: "You"
post_appeal:
creator: "You"
creator_id: "You"