From 2e4f8003b62e2085d074dfba901ff56297b96242 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 24 Mar 2020 19:16:49 +0000 Subject: [PATCH 1/2] Fix group factory in rails 4 params[:address] was breaking the creation of the EnterpriseGroup --- lib/tasks/sample_data/group_factory.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/tasks/sample_data/group_factory.rb b/lib/tasks/sample_data/group_factory.rb index 15e1ed1fb9..1e63866582 100644 --- a/lib/tasks/sample_data/group_factory.rb +++ b/lib/tasks/sample_data/group_factory.rb @@ -10,19 +10,21 @@ class GroupFactory return if EnterpriseGroup.where(name: "Producer group").exists? create_group( - name: "Producer group", - owner: enterprises.first.owner, - on_front_page: true, - description: "The seed producers", - address: "6 Rollings Road, Upper Ferntree Gully, 3156" + { + name: "Producer group", + owner: enterprises.first.owner, + on_front_page: true, + description: "The seed producers" + }, + "6 Rollings Road, Upper Ferntree Gully, 3156" ) end private - def create_group(params) + def create_group(params, group_address) group = EnterpriseGroup.new(params) - group.address = address(params[:address]) + group.address = address(group_address) group.enterprises = enterprises group.save! end From e5e9325499c442f1701db58806c22e803723955d Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 24 Mar 2020 19:17:16 +0000 Subject: [PATCH 2/2] Fix paper_trail custom_data for order_cycle, custom data must be a string, cant be an array --- app/models/order_cycle.rb | 2 +- app/models/schedule.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index e9afe06e5a..c4b0bbcda3 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -17,7 +17,7 @@ class OrderCycle < ActiveRecord::Base has_many :distributors, source: :receiver, through: :cached_outgoing_exchanges, uniq: true has_and_belongs_to_many :schedules, join_table: 'order_cycle_schedules' - has_paper_trail meta: { custom_data: :schedule_ids } + has_paper_trail meta: { custom_data: proc { |order_cycle| order_cycle.schedule_ids.to_s } } attr_accessor :incoming_exchanges, :outgoing_exchanges diff --git a/app/models/schedule.rb b/app/models/schedule.rb index 1f8c5b9b3a..3c5bf1918d 100644 --- a/app/models/schedule.rb +++ b/app/models/schedule.rb @@ -1,6 +1,6 @@ class Schedule < ActiveRecord::Base has_and_belongs_to_many :order_cycles, join_table: 'order_cycle_schedules' - has_paper_trail meta: { custom_data: :order_cycle_ids } + has_paper_trail meta: { custom_data: proc { |schedule| schedule.order_cycle_ids.to_s } } has_many :coordinators, uniq: true, through: :order_cycles