From c31f2791ace0c10b4f1e16853bcdcd2a6c1618dc Mon Sep 17 00:00:00 2001
From: Ethan McCutchen <ethan@grasscommons.org>
Date: Fri, 12 Oct 2012 13:17:17 -0600
Subject: [PATCH] fixed set mod loading problem

---
 app/models/card.rb            | 11 ++---------
 lib/packs/right/rstar_pack.rb | 13 +++++++++++--
 lib/wagn/cache.rb             |  1 +
 lib/wagn/model/pattern.rb     |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/models/card.rb b/app/models/card.rb
index b2c5b7f20..0140ae284 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -162,14 +162,7 @@ def include_set_modules
   def reset_mods
     @set_mods_loaded=false
   end
-
-  def clone
-    tmp_persisted = @persisted
-    @persisted = false
-    klone = super
-    @persisted = tmp_persisted
-    klone
-  end
+  
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # STATES
 
@@ -235,7 +228,7 @@ def save!
 
   def base_before_save
     if self.respond_to?(:before_save) and self.before_save == false
-      errors.add(:save, "could not prepare card for destruction")
+      errors.add(:save, "could not prepare card for destruction") #fixme - screwy error handling!!  
       return false
     end
   end
diff --git a/lib/packs/right/rstar_pack.rb b/lib/packs/right/rstar_pack.rb
index 103959213..46717d860 100644
--- a/lib/packs/right/rstar_pack.rb
+++ b/lib/packs/right/rstar_pack.rb
@@ -39,8 +39,9 @@ class Wagn::Renderer::Html
       else
         current_rule = current_rule.refresh if current_rule.frozen?
         current_rule.assign_attributes card_args
+        current_rule.include_set_modules
       end
-      current_rule.include_set_modules
+      
       set_selected = card_args[:name].to_cardname.left_name.to_s
     end
     
@@ -149,7 +150,15 @@ class Wagn::Renderer::Html
 
 
           %{</div>
-          <div class="rule-content">#{ edit_mode ? content_field(form, :skip_rev_id=>true) : (current_set_key ? render_core : '') }</div>
+          <div class="rule-content">
+            #{ 
+            case
+            when edit_mode       ; content_field form, :skip_rev_id=>true
+            when current_set_key ; render_core
+            else ''
+            end
+            }
+          </div>
         </div>
        </div> }.html_safe +
 
diff --git a/lib/wagn/cache.rb b/lib/wagn/cache.rb
index 21546e992..8845b830e 100644
--- a/lib/wagn/cache.rb
+++ b/lib/wagn/cache.rb
@@ -169,6 +169,7 @@ def fetch_local key
       else
         val = yield
         val.reset_mods if val.respond_to?(:reset_mods)
+        #why does this happen here?
         @local[key] = val
       end
     end
diff --git a/lib/wagn/model/pattern.rb b/lib/wagn/model/pattern.rb
index a8402f3c3..45fd782ef 100644
--- a/lib/wagn/model/pattern.rb
+++ b/lib/wagn/model/pattern.rb
@@ -29,7 +29,7 @@ def reset_patterns_if_rule()
 
     def reset_patterns
       @rule_cards={}
-      @real_set_names = @set_mods_loaded = @junction_only = @patterns =
+      @real_set_names = @set_mods_loaded = @junction_only = @patterns = @set_modules =
         @method_keys = @set_names = @template = @skip_type_lookup = nil
       true
     end