Merge pull request DMPRoadmap#2970 from DigitalCurationCentre/bug_423…

…_merging_accounts

Issue #462 - Fix for error messaging when you attempt Merge accounts

app/controllers/super_admin/users_controller.rb

@@ -64,16 +64,18 @@ def update
     def merge
       @user = User.find(params[:id])
       authorize @user
-      remove = User.find(params[:merge_id])
 
-      if @user.merge(remove)
-        flash.now[:notice] = success_message(@user, _("merged"))
+      if params[:id] != params[:merge_id]
+        merge_accounts
       else
-        flash.now[:alert] = failure_message(@user, _("merge"))
+        flash.now[:alert] = _("You attempted to merge 2 accounts with the same email address.
+           Please merge with a different email address.")
       end
+
       # After merge attempt get departments and plans
       @departments = @user.org.departments.order(:name)
       @plans = Plan.active(@user).page(1)
+
       render :edit
     end
 
@@ -121,6 +123,15 @@ def user_params
                                    :other_organisation)
     end
 
+    def merge_accounts
+      remove = User.find(params[:merge_id])
+      if @user.merge(remove)
+        flash.now[:notice] = success_message(@user, _("merged"))
+      else
+        flash.now[:alert] = failure_message(@user, _("merge"))
+      end
+    end
+
   end
 
 end