From 2e88bec14bb9cee82c1f3e5479c081eeadd89be5 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 15 Feb 2017 12:17:55 -0600
Subject: Fix setup issue and refine error messages

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 settings/js/users/users.js | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'settings/js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 55939c289c0..a6dcafcdac3 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -918,7 +918,7 @@ $(document).ready(function () {
 			}));
 			return false;
 		}
-		if ($.trim(password) === '' && !$('#CheckboxMailPasswordOnUserCreate').is(':checked')) {
+		if ($.trim(password) === '' && !$('#CheckboxMailOnUserCreate').is(':checked')) {
 			OC.Notification.showTemporary(t('settings', 'Error creating user: {message}', {
 				message: t('settings', 'A valid password must be provided')
 			}));
@@ -1044,37 +1044,15 @@ $(document).ready(function () {
 
 	if ($('#CheckboxMailOnUserCreate').is(':checked')) {
 		$("#newemail").show();
-		$("#MailPasswordOnUserCreateSetting").show();
 	}
-
-	if ($('#CheckboxMailPasswordOnUserCreate').is(':checked')) {
-		$("#newuserpassword").hide();
-	} else {
-		$("#newuserpassword").show();
-	}
-
 	// Option to display/hide the "E-Mail" input field
 	$('#CheckboxMailOnUserCreate').click(function() {
 		if ($('#CheckboxMailOnUserCreate').is(':checked')) {
 			$("#newemail").show();
-			$("#MailPasswordOnUserCreateSetting").show();
 			OCP.AppConfig.setValue('core', 'umgmt_send_email', 'true');
 		} else {
 			$("#newemail").hide();
-			$("#MailPasswordOnUserCreateSetting").hide();
 			OCP.AppConfig.setValue('core', 'umgmt_send_email', 'false');
-			OCP.AppConfig.setValue('core', 'umgmt_send_passwordlink', 'false');
-			$('#CheckboxMailPasswordOnUserCreate').removeAttr('checked');
-		}
-	});
-
-	$('#CheckboxMailPasswordOnUserCreate').click(function() {
-		if ($('#CheckboxMailPasswordOnUserCreate').is(':checked')) {
-			OCP.AppConfig.setValue('core', 'umgmt_send_passwordlink', 'true');
-			$("#newuserpassword").hide();
-		} else {
-			OCP.AppConfig.setValue('core', 'umgmt_send_passwordlink', 'false');
-			$("#newuserpassword").show();
 		}
 	});
 
-- 
cgit v1.2.3