From 08f247644b9f0f87dde1d3eb769aa1977932a065 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 21 Feb 2013 23:41:57 +0000 Subject: [PATCH] control at least one rbacmanager/usermanager has been choosed git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1448856 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/i18n/default.properties | 3 +++ .../src/main/webapp/js/archiva/general-admin.js | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) 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 654b68d60..28576caf7 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 @@ -678,6 +678,9 @@ runtime-configuration.maven.network.title=Maven Network redback.runtime.ldap.mapping.group.label=LDAP Groups redback.runtime.ldap.mapping.roles.label=Roles +error.redback.runtimeconfiguration.user-managers.empty=You must choose at least one userManager +error.redback.runtimeconfiguration.rbac-managers.empty=You must choose at least one rbacManager + #welcome welcome.title=Welcome to Apache Archiva diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js index d5db925e0..e63c42da1 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js @@ -1582,6 +1582,22 @@ define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout" } } + clearUserMessages(); + + if (self.usedUserManagerImpls().length<1){ + displayErrorMessage( $.i18n.prop("error.redback.runtimeconfiguration.user-managers.empty")); + valid=false; + } + + if (self.usedRbacManagerImpls().length<1){ + displayErrorMessage( $.i18n.prop("error.redback.runtimeconfiguration.rbac-managers.empty")); + valid=false; + } + + if(valid==false){ + return; + } + $.log("saveRedbackRuntimeConfiguration"); var saveButton = mainContent.find("#redback-runtime-configuration-save" ); saveButton.button('loading'); -- 2.39.5