Skip to content

Commit

Permalink
fixed set mod loading problem
Browse files Browse the repository at this point in the history
  • Loading branch information
ethn committed Oct 12, 2012
1 parent 1d1b6bc commit c31f279
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
11 changes: 2 additions & 9 deletions app/models/card.rb
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions lib/packs/right/rstar_pack.rb
Expand Up @@ -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

Expand Down Expand Up @@ -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 +

Expand Down
1 change: 1 addition & 0 deletions lib/wagn/cache.rb
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/wagn/model/pattern.rb
Expand Up @@ -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
Expand Down

0 comments on commit c31f279

Please sign in to comment.