GRN2-260: Added the ability to merge user accounts (#938)

* Added the ability to merge user accounts

* Styling fixes

app/views/admins/components/_users.html.erb

@@ -124,6 +124,9 @@
                               <%= link_to admin_edit_user_path(user_uid: user.uid), class: "dropdown-item" do %>
                                 <i class="dropdown-icon fas fa-user-edit"></i> <%= t("administrator.users.settings.edit") %>
                               <% end %>
+                              <button class= "merge-user dropdown-item" data-path="<%= merge_user_path(user_uid: user.uid) %>" data-info="<%= user.slice(:name, :email, :uid).to_json %>" data-toggle="modal" data-target="#mergeUserModal">
+                                <i class="dropdown-icon fas fa-user-friends"></i> <%= t("administrator.users.settings.merge") %>
+                              </button>
                               <%= button_to admin_ban_path(user_uid: user.uid), class: "dropdown-item", "data-disable": "" do %>
                                 <i class="dropdown-icon fas fa-lock"></i> <%= t("administrator.users.settings.ban") %>
                               <% end %>
@@ -157,3 +160,4 @@
 
 <%= render "shared/modals/invite_user_modal" %>
 <%= render "shared/modals/delete_account_modal", delete_location: relative_root %>
+<%= render "shared/modals/merge_user_modal" %>

app/views/shared/modals/_merge_user_modal.html.erb

@@ -0,0 +1,51 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+%>
+
+<div class="modal fade" id="mergeUserModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content text-center">
+      <div class="modal-body">
+        <div class="card-body p-6">
+          <div class="card-title">
+            <h3><%= t("modal.merge_user.title") %></h3>
+          </div>
+          <select class="selectpicker" title="<%= t("modal.share_access.select") %>" data-live-search="true" data-virtual-scroll="true" >
+            <% @user_list.each do |user| %>
+                <option value="<%= { uid: user.uid, email: user.email, name: user.name }.to_json %>" data-subtext="<%= user.email %>" ><%= user.name %></option>
+              <% end %>
+          </select>
+          <div class="mt-5 text-left row">
+            <div class="list-group-item col-6 text-center">
+              <label class="form-label text-primary"><%= t("modal.merge_user.from") %></label>
+               <div id="merge-from"></div>
+            </div>
+            <i id="merge-account-arrow" class="fas fa-2x fa-arrow-circle-right text-primary"></i>
+            <div class="list-group-item col-6 text-center">
+              <label class="form-label text-primary"><%= t("modal.merge_user.to") %></label>
+               <div id="merge-to"></div>
+            </div>
+          </div>
+          <div class="mt-6">
+            <button id="merge-save-access" class="btn btn-primary btn-block" onclick="mergeUsers()" ><%= t("modal.merge_user.save") %></button>
+            <button class="btn btn-secondary text-primary btn-block" onclick="$('#mergeUserModal').modal('hide')"><%= t("modal.merge_user.cancel") %></button>
+          </div>
+        </div>
+        <div class="card-footer">
+          <p><%= t("modal.merge_user.footer") %></p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/shared/modals/_share_room_modal.html.erb

@@ -21,7 +21,7 @@
           <div class="card-title">
             <h3><%= t("modal.share_access.title") %></h3>
           </div>
-          <select class="selectpicker" title="<%= t("modal.share_access.select") %>..." data-live-search="true" data-virtual-scroll="true" >
+          <select class="selectpicker" title="<%= t("modal.share_access.select") %>" data-live-search="true" data-virtual-scroll="true" >
             <% @user_list.each do |user| %>
                 <option value="<%= user.uid %>" data-subtext="<%= user.uid %>" ><%= user.name %></option>
               <% end %>