Commit 350a9aa9 authored by James Lopez's avatar James Lopez

fix create_or_update_import_data

parent 0ceee903
...@@ -419,7 +419,10 @@ class Project < ActiveRecord::Base ...@@ -419,7 +419,10 @@ class Project < ActiveRecord::Base
def create_or_update_import_data(data: nil, credentials: nil) def create_or_update_import_data(data: nil, credentials: nil)
project_import_data = import_data || build_import_data project_import_data = import_data || build_import_data
project_import_data.data = data if data if data
project_import_data.data ||= {}
project_import_data.data = project_import_data.data.merge(data)
end
if credentials if credentials
project_import_data.credentials ||= {} project_import_data.credentials ||= {}
project_import_data.credentials = project_import_data.credentials.merge(credentials) project_import_data.credentials = project_import_data.credentials.merge(credentials)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment