Merge pull request #2988 from ehelms/bug-993588

Bug 993588: Previously, if no default_environment_id was specified as
Katello · Sep 20, 2013 · 36940af · 36940af
2 parents e8cc151 + db24547
commit 36940af
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
@@ -96,11 +96,14 @@ def update
     user_params = params[:user].reject { |k, _| k == 'default_environment_id' }
 
     @user.update_attributes!(user_params)
-    @user.default_environment = if params[:user][:default_environment_id]
-                                  KTEnvironment.find(params[:user][:default_environment_id])
-                                else
-                                  nil
-                                end
+
+    if params[:user].key?(:default_environment_id)
+      if !params[:user][:default_environment_id].blank?
+        @user.default_environment = KTEnvironment.find(params[:user][:default_environment_id])
+      else
+        @user.default_environment = nil
+      end
+    end
 
     if !params[:default_locale].blank?
       #TODO: this should be placed in model validations