From 006acac6b55a2f187eba9a9dbab053ba2593d196 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Thu, 17 Dec 2015 23:20:19 +0800 Subject: [PATCH] remove redundant authorize_to_view function --- app/models/map.rb | 8 -------- app/models/synapse.rb | 9 --------- app/models/topic.rb | 10 +--------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/app/models/map.rb b/app/models/map.rb index 8bca3b30..87019d2a 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -107,14 +107,6 @@ class Map < ActiveRecord::Base end return self end - - # returns Boolean if user allowed to view Topic, Synapse, or Map - def authorize_to_view(user) - if (self.permission == "private" && self.user != user) - return false - end - return true - end def decode_base64(imgBase64) decoded_data = Base64.decode64(imgBase64) diff --git a/app/models/synapse.rb b/app/models/synapse.rb index 2745106f..943c8635 100644 --- a/app/models/synapse.rb +++ b/app/models/synapse.rb @@ -48,13 +48,4 @@ class Synapse < ActiveRecord::Base end return false end - - # returns Boolean if user allowed to view Topic, Synapse, or Map - def authorize_to_view(user) - if (self.permission == "private" && self.user != user) - return false - end - return true - end - end diff --git a/app/models/topic.rb b/app/models/topic.rb index 8bac9606..6f694868 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -78,7 +78,7 @@ class Topic < ActiveRecord::Base def has_viewable_synapses(current) result = false synapses.each do |synapse| - if synapse.authorize_to_view(current) + if synapse.authorize_to_show(current) result = true end end @@ -111,12 +111,4 @@ class Topic < ActiveRecord::Base end return false end - - # returns Boolean if user allowed to view Topic, Synapse, or Map - def authorize_to_view(user) - if (self.permission == "private" && self.user != user) - return false - end - return true - end end