diff --git a/app/controllers/concerns/import_url_params.rb b/app/controllers/concerns/import_url_params.rb index d9070e51573a55a0138a91425a876fd6ffadb806..765654ca2cb48335d6cf3f1f560315fa6b41e54f 100644 --- a/app/controllers/concerns/import_url_params.rb +++ b/app/controllers/concerns/import_url_params.rb @@ -2,12 +2,7 @@ module ImportUrlParams def import_url_params - import_params = - params - .require(:project) - .permit(:import_url, :import_url_user, :import_url_password) - - { import_url: import_params_to_full_url(import_params) } + { import_url: import_params_to_full_url(params[:project]) } end def import_params_to_full_url(params) diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb index 25a137eeb38a17ac9bd2cfa71f17d88bfff246d3..afbf9fd77201bb02f6b15a8f54f5ee675020bb6a 100644 --- a/app/controllers/projects/imports_controller.rb +++ b/app/controllers/projects/imports_controller.rb @@ -14,7 +14,7 @@ class Projects::ImportsController < Projects::ApplicationController end def create - if @project.update(import_url_params) + if @project.update(import_params) @project.import_state.reset.schedule end @@ -66,4 +66,14 @@ class Projects::ImportsController < Projects::ApplicationController redirect_to project_path(@project) end end + + def import_params_attributes + [] + end + + def import_params + params.require(:project) + .permit(import_params_attributes) + .merge(import_url_params) + end end