aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2016-11-28 10:25:40 +0100
committerAlban Peignier2016-11-28 11:03:24 +0100
commit9b3db9a441533b159723f31f72e13322894ca30a (patch)
tree96824cdbf49828aa87f014fd97f7113a49764d25
parent7353dcd212d3cc3eba1fee08dad7d12d7fcf5d29 (diff)
downloadchouette-core-9b3db9a441533b159723f31f72e13322894ca30a.tar.bz2
Fixes Referential#init_metadatas to support multi-periods. Refs #2054
-rw-r--r--app/controllers/referentials_controller.rb4
-rw-r--r--app/models/referential.rb6
2 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 8a433872a..937fd0b76 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -14,7 +14,7 @@ class ReferentialsController < BreadcrumbController
@referential.workbench_id ||= params[:workbench_id]
if @referential.in_workbench?
- @referential.init_metadatas first_period_begin: Date.today, first_period_end: Date.today.advance(months: 1)
+ @referential.init_metadatas default_date_range: Range.new(Date.today, Date.today.advance(months: 1))
end
end
end
@@ -36,7 +36,7 @@ class ReferentialsController < BreadcrumbController
def edit
edit! do
if @referential.in_workbench?
- @referential.init_metadatas first_period_begin: Date.today, first_period_end: Date.today.advance(months: 1)
+ @referential.init_metadatas default_date_range: Range.new(Date.today, Date.today.advance(months: 1))
end
end
end
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 1a4b543b7..7d0b0cf93 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -187,7 +187,11 @@ class Referential < ActiveRecord::Base
end
def init_metadatas(attributes = {})
- metadatas.build attributes if metadatas.blank?
+ if metadatas.blank?
+ date_range = attributes.delete :default_date_range
+ metadata = metadatas.build attributes
+ metadata.periodes = [date_range] if date_range
+ end
end
def clone_associations