aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-09-24 11:08:22 +0100
committerLouise Crow <louise.crow@gmail.com>2014-09-24 13:28:30 +0100
commit03471adfe714994524a07c9d99fc38ae9bddfa5c (patch)
tree076d43801ba47266e461842331210ee638a3f79b /app/models
parentd04d14442dc29b7279983232eb4323917c74ce6f (diff)
fixup! Validation of display order, default setting callbacks.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/public_body_category_link.rb4
-rw-r--r--app/models/public_body_heading.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/public_body_category_link.rb b/app/models/public_body_category_link.rb
index e5a0d7f25..d1ea5bdbb 100644
--- a/app/models/public_body_category_link.rb
+++ b/app/models/public_body_category_link.rb
@@ -17,11 +17,11 @@ class PublicBodyCategoryLink < ActiveRecord::Base
before_validation :on => :create do
unless self.category_display_order
- self.category_display_order = PublicBodyCategoryLink.next_display_order(self.public_body_heading_id)
+ self.category_display_order = PublicBodyCategoryLink.next_display_order(public_body_heading_id)
end
end
- def PublicBodyCategoryLink.next_display_order(heading_id)
+ def self.next_display_order(heading_id)
if last = where(:public_body_heading_id => heading_id).order(:category_display_order).last
last.category_display_order + 1
else
diff --git a/app/models/public_body_heading.rb b/app/models/public_body_heading.rb
index e675162f8..bbed55b29 100644
--- a/app/models/public_body_heading.rb
+++ b/app/models/public_body_heading.rb
@@ -58,7 +58,7 @@ class PublicBodyHeading < ActiveRecord::Base
end
end
- def PublicBodyHeading.next_display_order
+ def self.next_display_order
if max = maximum(:display_order)
max + 1
else