[Pkg-owncloud-commits] [owncloud] 07/95: no fruitless count attempts, and notification should disappear

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.0.1
in repository owncloud.

commit 1740fb236e50bf9cbc442df0085f1aa2326d82a2
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Thu Feb 5 16:25:22 2015 +0100

    no fruitless count attempts, and notification should disappear
---
 apps/user_ldap/ajax/wizard.php |  2 +-
 apps/user_ldap/js/settings.js  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index 48bfb56..7c4ef3a 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -85,7 +85,7 @@ switch($action) {
 				exit;
 			}
 		} catch (\Exception $e) {
-			\OCP\JSON::error(array('message' => $e->getMessage()));
+			\OCP\JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
 			exit;
 		}
 		\OCP\JSON::error();
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index b1abb09..768d62a 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -351,7 +351,7 @@ var LdapWizard = {
 				encodeURIComponent($('#ldap_serverconfig_chooser').val());
 
 		LdapWizard.showSpinner(spinnerID);
-		var request = LdapWizard.ajax(param,
+		LdapWizard.ajax(param,
 			function(result) {
 				LdapWizard.applyChanges(result);
 				LdapWizard.hideSpinner(spinnerID);
@@ -360,7 +360,7 @@ var LdapWizard = {
 				}
 			},
 			function (result) {
-				OC.Notification.show('Counting the entries failed with, ' + result.message);
+				OC.Notification.showTemporary('Counting the entries failed with: ' + result.message);
 				LdapWizard.hideSpinner(spinnerID);
 				if(!_.isUndefined(doneCallback)) {
 					doneCallback(method);
@@ -371,11 +371,17 @@ var LdapWizard = {
 	},
 
 	countGroups: function(doneCallback) {
-		LdapWizard._countThings('countGroups', '#ldap_group_count', doneCallback);
+		var groupFilter  = $('#ldap_group_filter').val();
+		if(!_.isEmpty(groupFilter)) {
+			LdapWizard._countThings('countGroups', '#ldap_group_count', doneCallback);
+		}
 	},
 
 	countUsers: function(doneCallback) {
-		LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
+		var userFilter  = $('#ldap_userlist_filter').val();
+		if(!_.isEmpty(userFilter)) {
+			LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
+		}
 	},
 
 	/**

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git