got rid of boneheaded tracked attribute mistake and unwanted test com…

…menting
wagn · Oct 26, 2010 · 11810c6 · 11810c6
1 parent cc2e32c
commit 11810c6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/app/models/role.rb b/app/models/role.rb
@@ -66,7 +66,8 @@ def find_configurables
     end  
 
     def [](codename) 
-      self.cache[codename.to_s] ||= Integer===codename ? Role.find(codename) : Role.find_by_codename(codename.to_s)
+      #            self.cache[codename.to_s] ||= Role.find_by_codename(codename.to_s)
+      self.cache[codename.to_s] ||= (Integer===codename ? Role.find(codename) : Role.find_by_codename(codename.to_s))
     end
   end
 end
diff --git a/lib/cardlib/permissions.rb b/lib/cardlib/permissions.rb
@@ -109,9 +109,10 @@ def permit(task, party) #assign permissions
     end
 
     def who_can(operation)
+      #perm = permissions.reject { |perm| perm.task != operation.to_s }.first   
+      #perm && perm.party ? perm.party : nil
       perm = Permission.find(:first, :conditions=>{:card_id=>self.id, :task=>operation.to_s })
-#      perm = permissions.reject { |perm| perm.task != operation.to_s }.first   
-      perm && Role[perm.party_id] #? perm.party : nil
+      perm && Role[perm.party_id.to_i] 
     end 
 
     def personal_user

diff --git a/lib/cardlib/tracked_attributes.rb b/lib/cardlib/tracked_attributes.rb
@@ -116,7 +116,7 @@ def set_permissions(perms)
 
     def set_reader(party)
       self.reader = party
-      if name.junction? && !party.anonymous?
+      if !party.anonymous?
         junctions.each do |dep| #note: this could be faster with WQL, but I'm not sure this WQL actually works correctly
           unless authenticated?(party) and !dep.who_can(:read).anonymous?
             dep.permit :read, party  

diff --git a/spec/models/wiki_reference_spec.rb b/spec/models/wiki_reference_spec.rb
@@ -17,15 +17,15 @@
 
     it "on template creation" do
       Card::Cardtype.create! :name=>"SpecialForm"
-     # Card::SpecialForm.create! :name=>"Form1", :content=>"foo"
-     # c = Card.find_by_name("Form1")
-     # c.references_expired.should be_nil
-     # Card.create! :name=>"SpecialForm+*type+*content", :content=>"{{+bar}}"
-     # Card["Form1"].references_expired.should be_true
-     # Slot.new(Card["Form1"]).render(:naked_content)
-     # c = Card.find_by_name("Form1")
-     # c.references_expired.should be_nil
-     # Card["Form1"].out_references.plot(:referenced_name).should == ["form1+bar"]
+      Card::SpecialForm.create! :name=>"Form1", :content=>"foo"
+      c = Card.find_by_name("Form1")
+      c.references_expired.should be_nil
+      Card.create! :name=>"SpecialForm+*type+*content", :content=>"{{+bar}}"
+      Card["Form1"].references_expired.should be_true
+      Slot.new(Card["Form1"]).render(:naked_content)
+      c = Card.find_by_name("Form1")
+      c.references_expired.should be_nil
+      Card["Form1"].out_references.plot(:referenced_name).should == ["form1+bar"]
     end
 
     it "on template update" do