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

Merge branch 'master' of github.com:r888888888/danbooru

Browse Source
This commit is contained in:
r888888888
2013-04-30 17:09:44 -07:00
parent 0a82162802 240eba56c2
commit dc58621c28
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/posts.js
View File

@@ -92,7 +92,7 @@
Danbooru.Post.initialize_shortcuts = function() { Danbooru.Post.initialize_shortcuts = function() {
$(document).bind("keydown.q", function(e) { $(document).bind("keydown.q", function(e) {
$("#tags").trigger("focus"); $("#tags").trigger("focus").selectEnd();
e.preventDefault(); e.preventDefault();
}); });

4
app/controllers/pools_controller.rb
View File

@@ -68,6 +68,8 @@ class PoolsController < ApplicationController
@pool = Pool.find(params[:id]) @pool = Pool.find(params[:id])
@version = PoolVersion.find(params[:version_id]) @version = PoolVersion.find(params[:version_id])
@pool.revert_to!(@version) @pool.revert_to!(@version)
respond_with(@pool, :notice => "Pool reverted") respond_with(@pool) do |format|
format.js
end
end end
end end

2
app/views/pool_versions/index.html.erb
View File

@@ -33,7 +33,7 @@
<td><%= compact_time pool_version.updated_at %></td> <td><%= compact_time pool_version.updated_at %></td>
<% if CurrentUser.is_member? %> <% if CurrentUser.is_member? %>
<td> <td>
<%= link_to "Revert", revert_pool_path(pool_version.pool_id, :version => pool_version.id) %> <%= link_to "Revert", revert_pool_path(pool_version.pool_id, :version_id => pool_version.id), :method => :put, :remote => true %>
</td> </td>
<% end %> <% end %>
</tr> </tr>

1
app/views/pools/revert.js.erb Normal file
View File

@@ -0,0 +1 @@
location.reload();