[Pkg-owncloud-commits] [owncloud] 197/239: Merge pull request #5955 from owncloud/fix5863

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 34704eded68c8b8bbd9d19364875d6abc1827433
Merge: af46d99 ce1318c
Author: blizzz <blizzz at owncloud.com>
Date:   Wed Nov 27 00:30:15 2013 -0800

    Merge pull request #5955 from owncloud/fix5863
    
    LDAP Wizard: Add raw login filter to corresponding tab for consistency, fix behaviour on raw filter input

 apps/user_ldap/ajax/wizard.php                     |   6 +
 apps/user_ldap/js/settings.js                      | 158 +++++++++++++++++----
 apps/user_ldap/lib/configuration.php               |   9 ++
 apps/user_ldap/lib/wizard.php                      |  39 +++++
 .../templates/part.wizard-loginfilter.php          |  10 ++
 apps/user_ldap/templates/settings.php              |   3 -
 6 files changed, 195 insertions(+), 30 deletions(-)

diff --cc apps/user_ldap/js/settings.js
index 2fa0ed0,9d824a9..5b5f203
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@@ -201,10 -205,10 +219,11 @@@ var LdapWizard = 
  		user = $('#ldap_dn').val();
  		pass = $('#ldap_agent_password').val();
  
 +		//FIXME: determine base dn with anonymous access
  		if(host && port && user && pass) {
  			param = 'action=guessBaseDN'+
- 					'&ldap_serverconfig_chooser='+$('#ldap_serverconfig_chooser').val();
+ 					'&ldap_serverconfig_chooser='+
+ 					encodeURIComponent($('#ldap_serverconfig_chooser').val());
  
  			LdapWizard.showSpinner('#ldap_base');
  			$('#ldap_base').prop('disabled', 'disabled');
@@@ -661,40 -743,9 +763,41 @@@
  		LdapWizard.toggleRawFilter('#rawUserFilterContainer',
  								   '#ldap_userfilter_objectclass',
  								   '#ldap_userfilter_groups',
- 								   'userFilterGroupSelectState'
+ 								   'userFilterGroupSelectState',
+ 								   'ldapUserFilterMode'
    								);
 +	},
 +
 +	updateStatusIndicator: function(isComplete) {
 +		if(isComplete) {
 +			LdapConfiguration.testConfiguration(
 +				//onSuccess
 +				function(result) {
 +					$('.ldap_config_state_indicator').text(t('user_ldap',
 +						'Configuration OK'
 +					));
 +					$('.ldap_config_state_indicator').addClass('ldap_grey');
 +					$('.ldap_config_state_indicator_sign').removeClass('error');
 +					$('.ldap_config_state_indicator_sign').addClass('success');
 +				},
 +				//onError
 +				function(result) {
 +					$('.ldap_config_state_indicator').text(t('user_ldap',
 +						'Configuration incorrect'
 +					));
 +					$('.ldap_config_state_indicator').removeClass('ldap_grey');
 +					$('.ldap_config_state_indicator_sign').addClass('error');
 +					$('.ldap_config_state_indicator_sign').removeClass('success');
 +				}
 +			);
 +		} else {
 +			$('.ldap_config_state_indicator').text(t('user_ldap',
 +				'Configuration incomplete'
 +			));
 +			$('.ldap_config_state_indicator').removeClass('ldap_grey');
 +			$('.ldap_config_state_indicator_sign').removeClass('error');
 +			$('.ldap_config_state_indicator_sign').removeClass('success');
 +		}
  	}
  };
  

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