diff options
2 files changed, 9 insertions, 6 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 99265dff5..0264c5a4e 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -597,5 +597,8 @@ redback.runtime.properties.key.label=Key redback.runtime.properties.value.label=Value redback.runtime.user-managers.impls.choosed=UserManager(s) choosed redback.runtime.user-managers.impls.available=UserManager(s) availables +redback.runtime.ldap.verified=Ldap connection verified. +redback.runtime.ldap.checkModification=Verify LDAP changes. +redback.runtime.ldap.checkServer=Verify LDAP configuration on server side. diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index 3ebe55aa3..596e6f7a6 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -1272,7 +1272,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" { type: "GET", success: function(data) { - var message=$.i18n.prop('archiva-runtime-configuration.ldap.verified'); + var message=$.i18n.prop('redback.runtime.ldap.verified'); displaySuccessMessage(message); }, error: function(data) { @@ -1299,7 +1299,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" data:ko.toJSON(self.archivaRuntimeConfiguration().ldapConfiguration), dataType: 'json', success: function(data) { - var message=$.i18n.prop('archiva-runtime-configuration.ldap.verified'); + var message=$.i18n.prop('redback.runtime.ldap.verified'); displaySuccessMessage(message); }, error: function(data) { @@ -1349,11 +1349,11 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" saveArchivaRuntimeConfiguration=function(){ $.log("saveArchivaRuntimeConfiguration"); - $("#archiva-runtime-configuration-save" ).button('loading'); + var saveButton = $("#archiva-runtime-configuration-save" ); + saveButton.button('loading'); clearUserMessages(); var userMessages=$("#user-messages"); userMessages.html(mediumSpinnerImg()); - $("#repository-group-save" ).button('loading'); self.archivaRuntimeConfiguration().userManagerImpls=ko.observableArray([]); $.log("length:"+self.usedUserManagerImpls().length); for(var i=0;i<self.usedUserManagerImpls().length;i++){ @@ -1370,7 +1370,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" data:ko.toJSON(self.archivaRuntimeConfiguration), dataType: 'json', success: function(data) { - var message=$.i18n.prop('archiva-runtime-configuration.updated');//,self.archivaRuntimeConfiguration().userManagerImpl()); + var message=$.i18n.prop('archiva-runtime-configuration.updated'); displaySuccessMessage(message); }, error: function(data) { @@ -1379,7 +1379,7 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" }, complete:function(data){ removeMediumSpinnerImg(userMessages); - $("#archiva-runtime-configuration-save" ).button('reset'); + saveButton.button('reset'); } } ); |