glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

style cleanup

Browse source
This commit is contained in:
Connor Turland 2016-12-15 10:14:35 -05:00
parent 33242f932f
commit 60898d2112
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/synapse.rb
View file

@ -45,10 +45,10 @@ class Synapse < ApplicationRecord
def after_updated def after_updated
attrs = ['desc', 'category', 'permission', 'defer_to_map_id'] attrs = ['desc', 'category', 'permission', 'defer_to_map_id']
if attrs.any? {|k| changed_attributes.key?(k)} if attrs.any? {|k| changed_attributes.key?(k)}
new = self.attributes.select {|k,v| attrs.include?(k) } new = self.attributes.select {|k| attrs.include?(k) }
old = changed_attributes.select {|k,v| attrs.include?(k) } old = changed_attributes.select {|k| attrs.include?(k) }
meta = new.merge(old) # we are prioritizing the old values, keeping them meta = new.merge(old) # we are prioritizing the old values, keeping them
meta['changed'] = changed_attributes.keys.select {|k| attrs.include?(k) } meta['changed'] = changed_attributes.keys.select {|k| attrs.include?(k) }
Events::SynapseUpdated.publish!(self, user, meta) Events::SynapseUpdated.publish!(self, user, meta)
end end
end end

6
app/models/topic.rb
View file

@ -140,10 +140,10 @@ class Topic < ApplicationRecord
def after_updated def after_updated
attrs = ['name', 'desc', 'link', 'metacode_id', 'permission', 'defer_to_map_id'] attrs = ['name', 'desc', 'link', 'metacode_id', 'permission', 'defer_to_map_id']
if attrs.any? {|k| changed_attributes.key?(k)} if attrs.any? {|k| changed_attributes.key?(k)}
new = self.attributes.select {|k,v| attrs.include?(k) } new = self.attributes.select {|k| attrs.include?(k) }
old = changed_attributes.select {|k,v| attrs.include?(k) } old = changed_attributes.select {|k| attrs.include?(k) }
meta = new.merge(old) # we are prioritizing the old values, keeping them meta = new.merge(old) # we are prioritizing the old values, keeping them
meta['changed'] = changed_attributes.keys.select {|k| attrs.include?(k) } meta['changed'] = changed_attributes.keys.select {|k| attrs.include?(k) }
Events::TopicUpdated.publish!(self, user, meta) Events::TopicUpdated.publish!(self, user, meta)
end end
end end