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

fix models that rubocop broke >:(

Browse source
This commit is contained in:
Devin Howard 2016-09-24 12:59:42 +08:00
parent f8c11f234d
commit 20bd959c69
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/models/synapse.rb
View file

@ -22,17 +22,12 @@ class Synapse < ApplicationRecord
where('node1_id = ? OR node2_id = ?', topic_id, topic_id) where('node1_id = ? OR node2_id = ?', topic_id, topic_id)
} }
# :nocov:
delegate :name, to: :user, prefix: true delegate :name, to: :user, prefix: true
# :nocov:
# :nocov:
def user_image def user_image
user.image.url user.image.url
end end
# :nocov:
# :nocov:
def collaborator_ids def collaborator_ids
if defer_to_map if defer_to_map
defer_to_map.editors.select { |mapper| mapper != user }.map(&:id) defer_to_map.editors.select { |mapper| mapper != user }.map(&:id)
@ -40,18 +35,12 @@ class Synapse < ApplicationRecord
[] []
end end
end end
# :nocov:
# :nocov:
def calculated_permission def calculated_permission
if defer_to_map defer_to_map&.permission || permission
defer_to_map&.permission
end end
# :nocov:
# :nocov:
def as_json(_options = {}) def as_json(_options = {})
super(methods: [:user_name, :user_image, :calculated_permission, :collaborator_ids]) super(methods: [:user_name, :user_image, :calculated_permission, :collaborator_ids])
end end
# :nocov:
end end

3
app/models/topic.rb
View file

@ -74,8 +74,7 @@ class Topic < ApplicationRecord
end end
def calculated_permission def calculated_permission
if defer_to_map defer_to_map&.permission || permission
defer_to_map&.permission
end end
def as_json(_options = {}) def as_json(_options = {})