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

Merge branch 'develop' into tvw

Browse source
This commit is contained in:
Connor Turland 2014-11-11 07:23:58 -05:00
commit d673172abf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/maps_controller.rb
View file

@ -87,7 +87,7 @@ class MapsController < ApplicationController
elsif m.category == "Topic"
object = m.topic
end
object.permission == "private" && (!authenticated? || (authenticated? && @current.id != object.user_id))
!object || (object.permission == "private" && (!authenticated? || (authenticated? && @current.id != object.user_id)))
}
respond_with(@allmappers, @allmappings, @allsynapses, @alltopics, @map)
@ -115,7 +115,7 @@ class MapsController < ApplicationController
elsif m.category == "Topic"
object = m.topic
end
object.permission == "private" && (!authenticated? || (authenticated? && @current.id != object.user_id))
!object || (object.permission == "private" && (!authenticated? || (authenticated? && @current.id != object.user_id)))
}
@json = Hash.new()