fix create_or_update_import_data

350a9aa9 · James Lopez · 0ceee903 · 350a9aa9
Commit 350a9aa9 authored Apr 07, 2016 by James Lopez
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

app/models/project.rb app/models/project.rb +4 -1

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -419,7 +419,10 @@ class Project < ActiveRecord::Base

  def create_or_update_import_data(data: nil, credentials: nil)
    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
      project_import_data.credentials ||= {}
      project_import_data.credentials = project_import_data.credentials.merge(credentials)