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

fixes #866

Browse Source
This commit is contained in:
Toks
2013-06-21 21:55:47 -04:00
parent 0bb6385169
commit 7726e85e33
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/post_versions_controller.rb
View File

@@ -16,7 +16,11 @@ class PostVersionsController < ApplicationController
def undo def undo
@post_version = PostVersion.find(params[:id]) @post_version = PostVersion.find(params[:id])
@post_version.undo!
if Danbooru.config.can_user_see_post?(CurrentUser.user, @post_version.post)
@post_version.undo!
end
respond_with(@post_version) do |format| respond_with(@post_version) do |format|
format.js format.js
end end

6
app/controllers/posts_controller.rb
View File

@@ -69,7 +69,11 @@ class PostsController < ApplicationController
def revert def revert
@post = Post.find(params[:id]) @post = Post.find(params[:id])
@version = PostVersion.find(params[:version_id]) @version = PostVersion.find(params[:version_id])
@post.revert_to!(@version)
if Danbooru.config.can_user_see_post?(CurrentUser.user, @post)
@post.revert_to!(@version)
end
respond_with(@post) do |format| respond_with(@post) do |format|
format.js format.js
end end

8
app/views/post_versions/_listing.html.erb
View File

@@ -36,10 +36,12 @@
<td><%= post_version_diff(post_version) %></td> <td><%= post_version_diff(post_version) %></td>
<% if CurrentUser.is_member? %> <% if CurrentUser.is_member? %>
<td> <td>
<% if post_version.id != post_version.post.versions.first.id %> <% if Danbooru.config.can_user_see_post?(CurrentUser.user, post_version.post) %>
<%= link_to "Undo", undo_post_version_path(post_version), :method => :put, :remote => true %> | <% if post_version.id != post_version.post.versions.first.id %>
<%= link_to "Undo", undo_post_version_path(post_version), :method => :put, :remote => true %> |
<% end %>
<%= link_to "Revert to", revert_post_path(post_version.post_id, :version_id => post_version.id), :method => :put, :remote => true %>
<% end %> <% end %>
<%= link_to "Revert to", revert_post_path(post_version.post_id, :version_id => post_version.id), :method => :put, :remote => true %>
</td> </td>
<% end %> <% end %>
</tr> </tr>

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

@@ -24,9 +24,7 @@
<section> <section>
<h1>History</h1> <h1>History</h1>
<ul> <ul>
<% if Danbooru.config.can_user_see_post?(CurrentUser.user, @post) %> <li><%= fast_link_to "Tags", post_versions_path(:search => {:post_id => @post.id}) %></li>
<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>
<li><%= fast_link_to "Flags", post_flags_path(:search => {:post_id => @post.id}) %></li> <li><%= fast_link_to "Flags", post_flags_path(:search => {:post_id => @post.id}) %></li>
<li><%= fast_link_to "Appeals", post_appeals_path(:search => {:post_id => @post.id}) %></li> <li><%= fast_link_to "Appeals", post_appeals_path(:search => {:post_id => @post.id}) %></li>