You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ja...@apache.org on 2008/03/20 16:47:58 UTC
svn commit: r639326 -
/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/groups/group-admin.js
Author: jann
Date: Thu Mar 20 08:47:58 2008
New Revision: 639326
URL: http://svn.apache.org/viewvc?rev=639326&view=rev
Log:
Save group even is rule is empty; otherwise only groups which includes a rule can be saved
Modified:
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/groups/group-admin.js
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/groups/group-admin.js
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/groups/group-admin.js?rev=639326&r1=639325&r2=639326&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/groups/group-admin.js (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/groups/group-admin.js Thu Mar 20 08:47:58 2008
@@ -202,6 +202,8 @@
var description = "";
var rule = "";
var messages = new java.util.ArrayList();
+
+ var valid = false;
var translator = cocoon.getComponent("org.apache.lenya.ac.saml.AttributeTranslator");
var attributeNames = translator.getSupportedResultNames();
@@ -235,25 +237,29 @@
}
else {
rule = cocoon.request.getParameter("rule").trim();
- var evaluator = groupManager.getAttributeRuleEvaluator();
- var result = evaluator.validate(rule);
- if (!result.succeeded()) {
- var validationMessages = result.getMessages();
- for (var i = 0; i < validationMessages.length; i++) {
- messages.add(validationMessages[i]);
- }
+ if (rule == "") {
+ rule = null;
}
- else {
- var configDir = groupManager.getConfigurationDirectory();
- var group = new Packages.org.apache.lenya.ac.file.FileGroup(configDir, groupId);
- group.setItemManager(groupManager);
- group.setName(name);
- group.setDescription(description);
- group.setRule(rule);
- group.save();
- groupManager.add(group);
- break;
- }
+ if (rule != null) {
+ var evaluator = groupManager.getAttributeRuleEvaluator();
+ var result = evaluator.validate(rule);
+ valid = result.succeeded();
+ if (!valid) {
+ var validationMessages = result.getMessages();
+ for (var i = 0; i < validationMessages.length; i++) {
+ messages.add(validationMessages[i]);
+ }
+ }
+ }
+ var configDir = groupManager.getConfigurationDirectory();
+ var group = new Packages.org.apache.lenya.ac.file.FileGroup(configDir, groupId);
+ group.setItemManager(groupManager);
+ group.setName(name);
+ group.setDescription(description);
+ if (valid) group.setRule(rule);
+ group.save();
+ groupManager.add(group);
+ break;
}
}
cocoon.redirectTo(redirectUri);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org