Commit 7f081b0c669077b5c2e52adba738e19cd07dcdae
1 parent
91398d8a
Exists in
master
and in
23 other branches
r268@sede: terceiro | 2007-07-29 23:49:16 -0300
creating boxes when creating design git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@272 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
8 additions
and
2 deletions
Show diff stats
vendor/plugins/design/lib/acts_as_design.rb
| @@ -25,10 +25,11 @@ class ActiveRecord::Base | @@ -25,10 +25,11 @@ class ActiveRecord::Base | ||
| 25 | serialize :design_data | 25 | serialize :design_data |
| 26 | attr_protected :design_data | 26 | attr_protected :design_data |
| 27 | 27 | ||
| 28 | - after_create do |design| | 28 | + before_create do |design| |
| 29 | template = Design::Template.find(design.template) | 29 | template = Design::Template.find(design.template) |
| 30 | while design.boxes.size < template.number_of_boxes | 30 | while design.boxes.size < template.number_of_boxes |
| 31 | - design.boxes << Design::Box.new(:name => 'Block') | 31 | + n = design.boxes.size + 1 |
| 32 | + design.boxes << Design::Box.new(:name => 'Block', :number => n) | ||
| 32 | end | 33 | end |
| 33 | end | 34 | end |
| 34 | 35 |
vendor/plugins/design/test/acts_as_design_test.rb
| @@ -51,12 +51,17 @@ class ActsAsDesignTest < Test::Unit::TestCase | @@ -51,12 +51,17 @@ class ActsAsDesignTest < Test::Unit::TestCase | ||
| 51 | end | 51 | end |
| 52 | 52 | ||
| 53 | def test_should_create_boxes_when_creating | 53 | def test_should_create_boxes_when_creating |
| 54 | + | ||
| 55 | + DesignTestUser.delete_all | ||
| 56 | + Design::Box.delete_all | ||
| 57 | + | ||
| 54 | user = DesignTestUser.create!(:name => 'A test user') | 58 | user = DesignTestUser.create!(:name => 'A test user') |
| 55 | 59 | ||
| 56 | # default template (test/designs/templates/default/default.yml) defines | 60 | # default template (test/designs/templates/default/default.yml) defines |
| 57 | # 3 boxes | 61 | # 3 boxes |
| 58 | assert_equal 3, Design::Template.find('default').number_of_boxes | 62 | assert_equal 3, Design::Template.find('default').number_of_boxes |
| 59 | assert_equal 3, user.boxes.size | 63 | assert_equal 3, user.boxes.size |
| 64 | + assert_equal 3, Design::Box.count | ||
| 60 | end | 65 | end |
| 61 | 66 | ||
| 62 | end | 67 | end |