diff --git a/app/javascript/views/plans/edit_details.js b/app/javascript/views/plans/edit_details.js index 14dca59..559cdeb 100644 --- a/app/javascript/views/plans/edit_details.js +++ b/app/javascript/views/plans/edit_details.js @@ -145,7 +145,7 @@ Select2.init('.plan-details'); - $('.plan-details form').on('submit', (e) => { + $('.plan-details form.madmp-fragment').on('submit', (e) => { e.preventDefault(); const target = $(e.target); const form = target.closest('form'); diff --git a/lib/dmpopidor/controllers/plans.rb b/lib/dmpopidor/controllers/plans.rb index 51909aa..4834d57 100644 --- a/lib/dmpopidor/controllers/plans.rb +++ b/lib/dmpopidor/controllers/plans.rb @@ -220,9 +220,6 @@ @plan = Plan.find(params[:id]) authorize @plan attrs = plan_params - meta = schema_params(MadmpSchema.find_by(name: "MetaStandard"), "meta") - project = schema_params(MadmpSchema.find_by(name: "ProjectStandard"), "project") - attrs[:title] = meta["title"] # rubocop:disable Metrics/BlockLength respond_to do |format| begin @@ -235,7 +232,6 @@ @plan.guidance_groups = GuidanceGroup.where(id: guidance_group_ids) @plan.save if @plan.update_attributes(attrs) - @plan.update_plan_fragments(meta, project) format.html do redirect_to plan_path(@plan), @@ -357,15 +353,12 @@ end private - # CHANGES : Research Outputs support + # CHANGES : Removed everything except guidances group info. The rest of the info is + # handled by MadmpFragmentController def plan_params params.require(:plan) - .permit(:org_id, :org_name, :funder_id, :funder_name, :template_id, - :title, :visibility, :grant_number, :description, :identifier, - :principal_investigator_phone, :principal_investigator, - :principal_investigator_email, :data_contact, - :principal_investigator_identifier, :data_contact_email, - :data_contact_phone, :guidance_group_ids, + .permit(:org_id, :template_id, :funder_name, :visibility, + :title, :org_name, :guidance_group_ids, research_outputs_attributes: %i[_destroy]) end diff --git a/lib/dmpopidor/models/plan.rb b/lib/dmpopidor/models/plan.rb index b051cbb..a7c4561 100644 --- a/lib/dmpopidor/models/plan.rb +++ b/lib/dmpopidor/models/plan.rb @@ -217,24 +217,6 @@ project_coordinator.update(parent_id: project.id) end - def update_plan_fragments(meta, project) - dmp_fragment = json_fragment - meta_fragment = dmp_fragment.meta - project_fragment = dmp_fragment.project - - meta_data = data_reformater( - meta_fragment.madmp_schema.schema, - meta - ) - project_data = data_reformater( - project_fragment.madmp_schema.schema, - project - ) - - meta_fragment.save_as_multifrag(meta_data, meta_fragment.madmp_schema) - project_fragment.save_as_multifrag(project_data, project_fragment.madmp_schema) - end - end end