diff --git a/app/controllers/madmp_fragments_controller.rb b/app/controllers/madmp_fragments_controller.rb index 9f75614..6740ecf 100644 --- a/app/controllers/madmp_fragments_controller.rb +++ b/app/controllers/madmp_fragments_controller.rb @@ -21,10 +21,10 @@ dmp_id: p_params[:dmp_id] ) data = @fragment.data.merge(data) - data = data.merge({ + additional_info = { "validations" => MadmpFragment.validate_data(data, schema.schema) - }) - @fragment.assign_attributes(data: data) + } + @fragment.assign_attributes(data: data, additional_info: additional_info) authorize @fragment unless p_params[:source] == "modal" @@ -50,10 +50,10 @@ madmp_schema: schema ) @fragment.classname = classname - data = data.merge({ + additional_info = { "validations" => MadmpFragment.validate_data(data, schema.schema) - }) - @fragment.assign_attributes(data: data) + } + @fragment.assign_attributes(data: data, additional_info: additional_info) unless p_params[:source] == "modal" @fragment.answer = Answer.create!({ diff --git a/app/models/madmp_fragment.rb b/app/models/madmp_fragment.rb index ccaaa18..6bb207c 100644 --- a/app/models/madmp_fragment.rb +++ b/app/models/madmp_fragment.rb @@ -160,10 +160,10 @@ sa.dmp_id = answer.plan.json_fragment().id sa.parent_id = parent_id end - data = data.merge({ + additional_info = { "validations" => self.validate_data(data, schema.schema) - }) - s_answer.assign_attributes(data: data) + } + s_answer.assign_attributes(data: data, additional_info: additional_info) s_answer.save end diff --git a/app/views/branded/shared/dynamic_form/_form.html.erb b/app/views/branded/shared/dynamic_form/_form.html.erb index 9f14fd6..7748d74 100644 --- a/app/views/branded/shared/dynamic_form/_form.html.erb +++ b/app/views/branded/shared/dynamic_form/_form.html.erb @@ -1,7 +1,8 @@ <%# locals: { f, fragment, schema, readonly, classname, fragment_id } %> <% sub_schemas = schema.get_sub_schemas %> <% data = fragment.data unless fragment.nil? %> -<% validations = data.present? && data['validations'].present? ? data["validations"] : nil %> +<% additional_info = fragment.additional_info unless fragment.nil? %> +<% validations = additional_info.present? && additional_info['validations'].present? ? additional_info["validations"] : nil %> <% sub_fragments = fragment.present? ? fragment.get_sub_fragments() : [] %> <% schema_properties = schema.schema["properties"]%>