Author: olamy
Date: Thu Dec 13 20:03:45 2012
New Revision: 1421466
URL: http://svn.apache.org/viewvc?rev=1421466&view=rev
Log:
add buttons to check ldap configuration
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1421466&r1=1421465&r2=1421466&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Thu Dec 13 20:03:45 2012
@@ -1262,6 +1262,58 @@ define("archiva.general-admin",["jquery"
}
}
+ checkLdapServerConfiguration=function(){
+ $.log("checkLdapServerConfiguration");
+ clearUserMessages();
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
+ $.log("checkChangedLdapConfiguration");
+
$.ajax("restServices/archivaServices/archivaRuntimeConfigurationService/checkLdapConnection",
+ {
+ type: "GET",
+ success: function(data) {
+ var
message=$.i18n.prop('archiva-runtime-configuration.ldap.verified');
+ displaySuccessMessage(message);
+ },
+ error: function(data) {
+ var res = $.parseJSON(data.responseText);
+ displayRestError(res);
+ },
+ complete:function(data){
+ removeMediumSpinnerImg(userMessages);
+ //$("#archiva-runtime-configuration-save" ).button('reset');
+ }
+ }
+ );
+ }
+
+ checkChangedLdapConfiguration=function(){
+ clearUserMessages();
+ var userMessages=$("#user-messages");
+ userMessages.html(mediumSpinnerImg());
+ $.log("checkChangedLdapConfiguration");
+
$.ajax("restServices/archivaServices/archivaRuntimeConfigurationService/checkLdapConnection",
+ {
+ type: "POST",
+ contentType: 'application/json',
+
data:ko.toJSON(self.archivaRuntimeConfiguration().ldapConfiguration),
+ dataType: 'json',
+ success: function(data) {
+ var
message=$.i18n.prop('archiva-runtime-configuration.ldap.verified');
+ displaySuccessMessage(message);
+ },
+ error: function(data) {
+ var res = $.parseJSON(data.responseText);
+ displayRestError(res);
+ },
+ complete:function(data){
+ removeMediumSpinnerImg(userMessages);
+ //$("#archiva-runtime-configuration-save" ).button('reset');
+ }
+ }
+ );
+ }
+
for(var i= 0;i<archivaRuntimeConfiguration.userManagerImpls().length;i++){
var id=archivaRuntimeConfiguration.userManagerImpls()[i];
$.log("id:"+id);
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html?rev=1421466&r1=1421465&r2=1421466&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
Thu Dec 13 20:03:45 2012
@@ -992,6 +992,14 @@
<!-- TODO extraPropertiesEntries -->
</fieldset>
</form>
+
+ <button data-bind="click: checkChangedLdapConfiguration,css:{
'btn-warning': archivaRuntimeConfiguration().ldapConfiguration().modified() },
+ enabled:
archivaRuntimeConfiguration().ldapConfiguration().modified()"
+
id="ldap-configuration-check-modification"class="btn">${$.i18n.prop('redback.runtime.ldap.checkModification')}</button>
+
+ <button data-bind="click: checkLdapServerConfiguration"
+
id="ldap-configuration-check-server"class="btn">${$.i18n.prop('redback.runtime.ldap.checkServer')}</button>
+
</div>
</div>
