From 13b9f36c04aa1bdfdbe17ea68fbbbf0775a7b143 Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Sat, 27 May 2023 15:26:25 +0300
Subject: [PATCH] v6.3.12.0

Changelog: https://roxy-wi.org/changelog#6_3_12
---
 app/templates/ajax/new_group.html      |  1 +
 app/templates/include/admin_users.html |  4 ----
 inc/users.js                           | 19 ++-----------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/templates/ajax/new_group.html b/app/templates/ajax/new_group.html
index 3e19e7e4..76f7cd9e 100644
--- a/app/templates/ajax/new_group.html
+++ b/app/templates/ajax/new_group.html
@@ -1,5 +1,6 @@
 {% for group in groups %}
 	<tr id="group-{{ group.group_id }}" class="newgroup">
+		<td class="padding10" style="width: 0">{{group.group_id}}</td>
 		<td class="padding10 first-collumn">
 			<input type="text" id="name-{{ group.group_id }}" value="{{ group.name }}" class="form-control">
 		</td>
diff --git a/app/templates/include/admin_users.html b/app/templates/include/admin_users.html
index 628f225b..22dfba19 100644
--- a/app/templates/include/admin_users.html
+++ b/app/templates/include/admin_users.html
@@ -15,7 +15,6 @@
 			<th style="width: 100%" id="user-services-th">{{lang.words.services|title()}}</th>
 			<th></th>
 			<th></th>
-			<th></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -81,9 +80,6 @@
 			<td>
 				<a href="history.py?service=user&user_id={{user.user_id}}" title="{{lang.words.view|title()}} {{lang.words.history}} {{lang.words.for}} {{lang.words.user2}}" class="history"></a>
 			</td>
-			<td>
-				<a class="add" onclick="cloneUser({{user.user_id}})" id="clone-{{user.user_id}}" title="{{lang.words.w_copy|title()}} {{lang.words.the}} {{lang.words.settings}} {{lang.words.from}} {{user.username}}" style="cursor: pointer;"></a>
-			</td>
 			<td>
 				<a class="delete" onclick="confirmDeleteUser({{user.user_id}})" title="{{lang.words.delete|title()}} {{user.username}}" style="cursor: pointer;"></a>
 			</td>
diff --git a/inc/users.js b/inc/users.js
index 7acea1d3..f8ce9daa 100644
--- a/inc/users.js
+++ b/inc/users.js
@@ -996,10 +996,11 @@ function common_ajax_action_after_success(dialog_id, new_group, ajax_append_id,
 function addUser(dialog_id) {
 	var valid = true;
 	toastr.clear();
-	allFields = $( [] ).add( $('#new-username') ).add( $('#new-password') )
+	allFields = $( [] ).add( $('#new-username') ).add( $('#new-password') ).add( $('#new-email') )
 	allFields.removeClass( "ui-state-error" );
 	valid = valid && checkLength( $('#new-username'), "user name", 1 );
 	valid = valid && checkLength( $('#new-password'), "password", 1 );
+	valid = valid && checkLength( $('#new-email'), "Email", 1 );
 	var activeuser = 0;
 	if ($('#activeuser').is(':checked')) {
 		activeuser = '1';
@@ -1612,22 +1613,6 @@ function cloneServer(id) {
 		$('#new-server-group-add').selectmenu("refresh");
 	}
 }
-function cloneUser(id) {
-	$( "#add-user-button" ).trigger( "click" );
-	if ($('#activeuser-'+id).is(':checked')) {
-		$('#activeuser').prop('checked', true)
-	} else {
-		$('#activeuser').prop('checked', false)
-	}
-	$('#activeuser').checkboxradio("refresh");
-	$('#new-role').val($('#role-'+id+' option:selected').val()).change()
-	$('#new-role').selectmenu("refresh");
-	cur_url = cur_url[0].split('#')[0]
-	if (cur_url == 'users.py') {
-		$('#new-group').val($('#usergroup-'+id+' option:selected').val()).change();
-		$('#new-group').selectmenu("refresh");
-	}
-}
 function cloneReceiver(id, reciever_name) {
 	$('#add-'+reciever_name+'-button').trigger( "click" );
 	$('#'+reciever_name+'-token-add').val($('#'+reciever_name+'-token-'+id).val());