mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13925 from owncloud/fix-13898 

no fruitless count attempts, and notification should disappear
This commit is contained in:
blizzz 2015-02-09 16:55:50 +01:00
parent 018f9fddaf 2bcb786214
commit dc475ab3e0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/ajax/wizard.php
View File

@ -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();

14
apps/user_ldap/js/settings.js
View File

@ -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);
}
},
/**