From 03471adfe714994524a07c9d99fc38ae9bddfa5c Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 24 Sep 2014 11:08:22 +0100 Subject: fixup! Validation of display order, default setting callbacks. --- app/models/public_body_category_link.rb | 4 ++-- app/models/public_body_heading.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/models') 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 -- cgit v1.2.3