This commit is contained in:
Toks 2013-04-24 08:51:23 -04:00
parent 3682067206
commit 69e5ca68bf
4 changed files with 17 additions and 2 deletions

View File

@ -130,6 +130,7 @@ class Pool < ActiveRecord::Base
def revert_to!(version)
self.post_ids = version.post_ids
self.name = version.name
synchronize!
end
@ -240,8 +241,9 @@ class Pool < ActiveRecord::Base
if last_version && CurrentUser.ip_addr == last_version.updater_ip_addr && CurrentUser.id == last_version.updater_id
last_version.update_column(:post_ids, post_ids)
last_version.update_column(:name, name)
else
versions.create(:post_ids => post_ids)
versions.create(:post_ids => post_ids, :name => name)
end
end
end

View File

@ -37,6 +37,10 @@ class PoolVersion < ActiveRecord::Base
User.id_to_name(updater_id)
end
def pretty_name
name.tr("_", " ")
end
def initialize_updater
self.updater_id = CurrentUser.id
self.updater_ip_addr = CurrentUser.ip_addr

View File

@ -21,7 +21,7 @@
<tbody>
<% @pool_versions.each do |pool_version| %>
<tr>
<td><%= link_to pool_version.pool.pretty_name, pool_path(pool_version.pool_id) %></td>
<td><%= link_to pool_version.pretty_name, pool_path(pool_version.pool_id) %></td>
<td><%= link_to pool_version.post_id_array.size, pool_versions_path(:search => {:pool_id => pool_version.pool_id}) %></td>
<td><%= pool_version_diff(pool_version) %></td>
<td><%= link_to_user pool_version.updater%></td>

View File

@ -0,0 +1,9 @@
class AddNameToPoolVersions < ActiveRecord::Migration
def change
execute("set statement_timeout = 0")
add_column :pool_versions, :name, :string
PoolVersion.all.each do |pool_version|
pool_version.update_column(:name, pool_version.pool.name)
end
end
end