tests are clean
Oleg
committed Sep 27, 2011
commit fce87205b2982f7033938c8691e428e15b616536
Showing 4
changed files with
5 additions
and 6 deletions
app/models/cms/file.rb
+1
-1
| @@ | @@ -25,7 +25,7 @@ class Cms::File < ActiveRecord::Base |
| # -- Callbacks ------------------------------------------------------------ | |
| before_save :assign_label | |
| - | before_save :assign_position, :on => :create |
| + | before_create :assign_position |
| # -- Scopes --------------------------------------------------------------- | |
| default_scope order(:position) | |
app/models/cms/layout.rb
+2
-2
| @@ | @@ -14,7 +14,7 @@ class Cms::Layout < ActiveRecord::Base |
| # -- Callbacks ------------------------------------------------------------ | |
| before_validation :assign_label | |
| - | before_save :assign_position, :on => :create |
| + | before_create :assign_position |
| after_save :clear_cached_page_content | |
| after_destroy :clear_cached_page_content | |
| @@ | @@ -77,7 +77,7 @@ protected |
| end | |
| def assign_position | |
| - | max = self.site.layouts.maximum(:position) |
| + | max = self.site.layouts.where(:parent_id => self.parent_id).maximum(:position) |
| self.position = max ? max + 1 : 0 | |
| end | |
app/models/cms/page.rb
+1
-2
| @@ | @@ -25,8 +25,7 @@ class Cms::Page < ActiveRecord::Base |
| before_validation :assigns_label, | |
| :assign_parent, | |
| :assign_full_path | |
| - | before_save :assign_position, |
| - | :on => :create |
| + | before_create :assign_position |
| before_save :set_cached_content | |
| after_save :sync_child_pages | |
app/models/cms/snippet.rb
+1
-1
| @@ | @@ -13,7 +13,7 @@ class Cms::Snippet < ActiveRecord::Base |
| # -- Callbacks ------------------------------------------------------------ | |
| before_validation :assign_label | |
| - | before_save :assign_position, :on => :create |
| + | before_create :assign_position |
| after_save :clear_cached_page_content | |
| after_destroy :clear_cached_page_content | |