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

fix map/mapping associations that I broke

Browse source
This commit is contained in:
Devin Howard 2015-09-19 16:48:24 +08:00 committed by Connor Turland
parent e9cb8561fa
commit 7d738b7abf
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -37,7 +37,7 @@ private
end end
def require_admin def require_admin
unless authenticated? && user.admin unless authenticated? && admin?
redirect_to root_url, notice: "You need to be an admin for that." redirect_to root_url, notice: "You need to be an admin for that."
return false return false
end end

6
app/models/map.rb
View file

@ -2,8 +2,10 @@ class Map < ActiveRecord::Base
belongs_to :user belongs_to :user
has_many :topics, -> { Mapping.topicmapping }, :through => :topicmappings has_many :topicmappings, -> { Mapping.topicmapping }, class_name: :Mapping
has_many :synapses, -> { Mapping.synapsemapping }, :through => :synapsemappings has_many :synapsemappings, -> { Mapping.synapsemapping }, class_name: :Mapping
has_many :topics, through: :topicmappings
has_many :synapses, through: :synapsemappings
# This method associates the attribute ":image" with a file attachment # This method associates the attribute ":image" with a file attachment
has_attached_file :screenshot, :styles => { has_attached_file :screenshot, :styles => {

4
app/models/mapping.rb
View file

@ -1,7 +1,7 @@
class Mapping < ActiveRecord::Base class Mapping < ActiveRecord::Base
scope :topicmapping, -> { where (category: :Topic) } scope :topicmapping, -> { where(category: :Topic) }
scope :synapsemapping, -> { where (category: :Synapse) } scope :synapsemapping, -> { where(category: :Synapse) }
belongs_to :topic, :class_name => "Topic", :foreign_key => "topic_id" belongs_to :topic, :class_name => "Topic", :foreign_key => "topic_id"
belongs_to :synapse, :class_name => "Synapse", :foreign_key => "synapse_id" belongs_to :synapse, :class_name => "Synapse", :foreign_key => "synapse_id"