You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/04/29 14:21:41 UTC

svn commit: r1476988 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js

Author: olamy
Date: Mon Apr 29 12:21:40 2013
New Revision: 1476988

URL: http://svn.apache.org/r1476988
Log:
fix message display when updating ldap

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js?rev=1476988&r1=1476987&r2=1476988&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js Mon Apr 29 12:21:40 2013
@@ -1641,14 +1641,16 @@ define("archiva.general-admin",["jquery"
       //save modified ldap group mappings if any
       if(self.modifiesLdapGroupMappings().length>0){
         $.log("save modifiesLdapGroupMappings");
+        var message=$.i18n.prop('redback-runtime-ldap-group-mapping.updated');
+        var userMessages=$("#user-messages");
         $.each(self.modifiesLdapGroupMappings(),function(idx,item){
           if(!(item.automatic&item.roleNames().length<2)){
+
+            userMessages.empty();
             $.log("update mapping for group:"+item.group());
             var mainContent=$("#main-content");
             var saveButton = mainContent.find("#redback-runtime-configuration-save" );
             saveButton.button('loading');
-            clearUserMessages();
-            var userMessages=$("#user-messages");
             userMessages.html(mediumSpinnerImg());
             $.ajax("restServices/redbackServices/ldapGroupMappingService",
                    {
@@ -1657,8 +1659,7 @@ define("archiva.general-admin",["jquery"
                      data:ko.toJSON(item),
                      dataType: 'json',
                      success: function(data) {
-                       var message=$.i18n.prop('redback-runtime-ldap-group-mapping.updated');
-                       displaySuccessMessage(message);
+                       userMessages.html($.tmpl($("#alert-message-success").html(), { "message" : message }));
                      },
                      error: function(data) {
                        var res = $.parseJSON(data.responseText);