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

fixes #866

Browse Source
This commit is contained in:
albert
2013-03-31 17:53:51 -04:00
parent 4946f23dc0
commit 0e052f2fd7
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.rb
View File

@@ -299,6 +299,9 @@ class User < ActiveRecord::Base
when Levels::ADMIN when Levels::ADMIN
"Admin" "Admin"
else
""
end end
end end

2
app/presenters/post_presenter.rb
View File

@@ -69,7 +69,7 @@ class PostPresenter < Presenter
def image_html(template) def image_html(template)
return template.content_tag("p", "The artist requested removal of this image") if @post.is_banned? && !CurrentUser.user.is_privileged? return template.content_tag("p", "The artist requested removal of this image") if @post.is_banned? && !CurrentUser.user.is_privileged?
return template.content_tag("p", "You need a privileged account to see this image.") if !Danbooru.config.can_user_see_post?(CurrentUser.user, @post) return template.content_tag("p", template.link_to("You need a privileged account to see this image.", template.upgrade_information_users_path)) if !Danbooru.config.can_user_see_post?(CurrentUser.user, @post)
if @post.is_flash? if @post.is_flash?
template.render("posts/partials/show/flash", :post => @post) template.render("posts/partials/show/flash", :post => @post)

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

@@ -24,7 +24,9 @@
<section> <section>
<h1>History</h1> <h1>History</h1>
<ul> <ul>
<li><%= fast_link_to "Tags", post_versions_path(:search => {:post_id => @post.id}) %></li> <% if Danbooru.config.can_user_see_post?(CurrentUser.user, @post) %>
<li><%= fast_link_to "Tags", post_versions_path(:search => {:post_id => @post.id}) %></li>
<% end %>
<li><%= fast_link_to "Notes", note_versions_path(:search => {:post_id => @post.id}) %></li> <li><%= fast_link_to "Notes", note_versions_path(:search => {:post_id => @post.id}) %></li>
</ul> </ul>
</section> </section>