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

remove things again not needed

Browse source
This commit is contained in:
Connor Turland 2016-03-12 11:53:12 +11:00
parent a78312f90c
commit 7f86810f62
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/mapping.rb
View file

@ -26,12 +26,4 @@ class Mapping < ActiveRecord::Base
super(:methods =>[:user_name, :user_image]) super(:methods =>[:user_name, :user_image])
end end
def authorize_to_show(user)
if ((self.map.permission == "private" && self.map.user != user) ||
(self.mappable.permission == "private" && self.mappable.user != user))
return false
end
return self
end
end end

4
app/models/user.rb
View file

@ -41,10 +41,6 @@ class User < ActiveRecord::Base
# Validate the attached image is image/jpg, image/png, etc # Validate the attached image is image/jpg, image/png, etc
validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/ validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/
def is_logged_in?
true
end
# override default as_json # override default as_json
def as_json(options={}) def as_json(options={})
{ :id => self.id, { :id => self.id,