diff --git a/app/models/pool.rb b/app/models/pool.rb index 8d26e6b42..adc4acf9a 100644 --- a/app/models/pool.rb +++ b/app/models/pool.rb @@ -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 diff --git a/app/models/pool_version.rb b/app/models/pool_version.rb index 9755781e9..c63a11207 100644 --- a/app/models/pool_version.rb +++ b/app/models/pool_version.rb @@ -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 diff --git a/app/views/pool_versions/index.html.erb b/app/views/pool_versions/index.html.erb index ce440b022..dafc759b7 100644 --- a/app/views/pool_versions/index.html.erb +++ b/app/views/pool_versions/index.html.erb @@ -21,7 +21,7 @@
<% @pool_versions.each do |pool_version| %>