Author: andreas
Date: Tue Dec 4 06:54:03 2007
New Revision: 600970
URL: http://svn.apache.org/viewvc?rev=600970&view=rev
Log:
[minor change] replaced tabs with spaces
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=600970&r1=600969&r2=600970&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 Tue Dec 4 06:54:03 2007
@@ -20,74 +20,74 @@
//
function groupChangeProfile() {
- resolve();
- try {
-
- var redirectUri = getRequestUri();
+ resolve();
+ try {
+
+ var redirectUri = getRequestUri();
var groupId = getAccreditableId();
- var groupManager = getAccreditableManager().getGroupManager();
- var group = groupManager.getGroup(groupId);
- var name = group.getName();
- var description = group.getDescription();
- var rule = group.getRule();
-
- var valid = false;
-
- var messages = new java.util.ArrayList();
-
- var translator = cocoon.getComponent("org.apache.lenya.ac.saml.AttributeTranslator");
- var attributeNames = translator.getSupportedResultNames();
-
- // at the moment the loop is executed only once (no form validation)
-
- while (!valid) {
- cocoon.sendPageAndWait("groups/profile.xml", {
- "group-id" : groupId,
- "name" : name,
- "description" : description,
- "rule" : rule,
- "page-title" : "Edit Profile",
- "attribute-names" : attributeNames,
- "messages" : messages
- });
+ var groupManager = getAccreditableManager().getGroupManager();
+ var group = groupManager.getGroup(groupId);
+ var name = group.getName();
+ var description = group.getDescription();
+ var rule = group.getRule();
+
+ var valid = false;
+
+ var messages = new java.util.ArrayList();
+
+ var translator = cocoon.getComponent("org.apache.lenya.ac.saml.AttributeTranslator");
+ var attributeNames = translator.getSupportedResultNames();
+
+ // at the moment the loop is executed only once (no form validation)
+
+ while (!valid) {
+ cocoon.sendPageAndWait("groups/profile.xml", {
+ "group-id" : groupId,
+ "name" : name,
+ "description" : description,
+ "rule" : rule,
+ "page-title" : "Edit Profile",
+ "attribute-names" : attributeNames,
+ "messages" : messages
+ });
- messages.clear();
-
- if (cocoon.request.getParameter("cancel")) {
- break;
- }
-
- if (cocoon.request.getParameter("submit")) {
- name = cocoon.request.getParameter("name");
- description = cocoon.request.getParameter("description");
- 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]);
- }
- }
- else {
- group.setName(name);
- group.setDescription(description);
- group.setRule(rule);
- group.save();
- valid = true;
- break;
- }
- }
-
- }
-
- cocoon.redirectTo(redirectUri);
- }
- finally {
- release();
- }
+ messages.clear();
+
+ if (cocoon.request.getParameter("cancel")) {
+ break;
+ }
+
+ if (cocoon.request.getParameter("submit")) {
+ name = cocoon.request.getParameter("name");
+ description = cocoon.request.getParameter("description");
+ 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]);
+ }
+ }
+ else {
+ group.setName(name);
+ group.setDescription(description);
+ group.setRule(rule);
+ group.save();
+ valid = true;
+ break;
+ }
+ }
+
+ }
+
+ cocoon.redirectTo(redirectUri);
+ }
+ finally {
+ release();
+ }
}
@@ -96,89 +96,89 @@
//
function groupChangeMembers() {
- resolve();
- try {
-
- var redirectUri = getRequestUri();
+ resolve();
+ try {
+
+ var redirectUri = getRequestUri();
var groupId = getAccreditableId();
- var userManager = getAccreditableManager().getUserManager();
- var groupManager = getAccreditableManager().getGroupManager();
- var group = groupManager.getGroup(groupId);
-
- var memberArray = group.getMembers();
-
- var groupUsers = new java.util.ArrayList();
- var otherUsers = new java.util.ArrayList();
- var groupMachines = new java.util.ArrayList();
- var otherMachines = new java.util.ArrayList();
-
- for (var i = 0; i < memberArray.length; i++) {
- var member = memberArray[i];
- if (member instanceof Packages.org.apache.lenya.ac.User) {
- groupUsers.add(member);
- }
- if (member instanceof Packages.org.apache.lenya.ac.Machine) {
- groupMachines.add(machine);
- }
- }
-
- var users = userManager.getUsers();
- for (var i = 0; i < users.length; i++) {
- if (!groupUsers.contains(users[i])) {
- otherUsers.add(users[i]);
- }
- }
-
- while (true) {
- cocoon.sendPageAndWait("groups/members.xml", {
- "group-id" : groupId,
- "users" : otherUsers,
- "group-users" : groupUsers,
- "machines" : otherMachines,
- "group-machines" : groupMachines,
- });
-
- var otherUserId = cocoon.request.getParameter("user");
- if (cocoon.request.getParameter("add_user") && otherUserId != null) {
- var user = userManager.getUser(otherUserId);
- if (!groupUsers.contains(user)) {
- groupUsers.add(user);
- otherUsers.remove(user);
- }
- }
-
- var groupUserId = cocoon.request.getParameter("group_user");
- if (cocoon.request.getParameter("remove_user") && groupUserId != null) {
- var user = userManager.getUser(groupUserId);
- if (groupUsers.contains(user)) {
- groupUsers.remove(user);
- otherUsers.add(user);
- }
- }
-
- if (cocoon.request.getParameter("cancel")) {
- break;
- }
-
- if (cocoon.request.getParameter("submit")) {
- group.removeAllMembers();
-
- var userIterator = groupUsers.iterator();
- while (userIterator.hasNext()) {
- var user = userIterator.next();
- group.add(user);
- user.save();
- }
-
- break;
- }
- }
- cocoon.redirectTo(redirectUri);
- }
- finally {
- release();
- }
+ var userManager = getAccreditableManager().getUserManager();
+ var groupManager = getAccreditableManager().getGroupManager();
+ var group = groupManager.getGroup(groupId);
+
+ var memberArray = group.getMembers();
+
+ var groupUsers = new java.util.ArrayList();
+ var otherUsers = new java.util.ArrayList();
+ var groupMachines = new java.util.ArrayList();
+ var otherMachines = new java.util.ArrayList();
+
+ for (var i = 0; i < memberArray.length; i++) {
+ var member = memberArray[i];
+ if (member instanceof Packages.org.apache.lenya.ac.User) {
+ groupUsers.add(member);
+ }
+ if (member instanceof Packages.org.apache.lenya.ac.Machine) {
+ groupMachines.add(machine);
+ }
+ }
+
+ var users = userManager.getUsers();
+ for (var i = 0; i < users.length; i++) {
+ if (!groupUsers.contains(users[i])) {
+ otherUsers.add(users[i]);
+ }
+ }
+
+ while (true) {
+ cocoon.sendPageAndWait("groups/members.xml", {
+ "group-id" : groupId,
+ "users" : otherUsers,
+ "group-users" : groupUsers,
+ "machines" : otherMachines,
+ "group-machines" : groupMachines,
+ });
+
+ var otherUserId = cocoon.request.getParameter("user");
+ if (cocoon.request.getParameter("add_user") && otherUserId != null) {
+ var user = userManager.getUser(otherUserId);
+ if (!groupUsers.contains(user)) {
+ groupUsers.add(user);
+ otherUsers.remove(user);
+ }
+ }
+
+ var groupUserId = cocoon.request.getParameter("group_user");
+ if (cocoon.request.getParameter("remove_user") && groupUserId != null) {
+ var user = userManager.getUser(groupUserId);
+ if (groupUsers.contains(user)) {
+ groupUsers.remove(user);
+ otherUsers.add(user);
+ }
+ }
+
+ if (cocoon.request.getParameter("cancel")) {
+ break;
+ }
+
+ if (cocoon.request.getParameter("submit")) {
+ group.removeAllMembers();
+
+ var userIterator = groupUsers.iterator();
+ while (userIterator.hasNext()) {
+ var user = userIterator.next();
+ group.add(user);
+ user.save();
+ }
+
+ break;
+ }
+ }
+ cocoon.redirectTo(redirectUri);
+ }
+ finally {
+ release();
+ }
}
//
@@ -186,75 +186,75 @@
//
function groupAddGroup() {
- resolve();
- try {
- var redirectUri = getRequestUri();
-
- var groupManager = getAccreditableManager().getGroupManager();
- var groupId = "";
- var name = "";
- var description = "";
- var rule = "";
- var messages = new java.util.ArrayList();
-
- var translator = cocoon.getComponent("org.apache.lenya.ac.saml.AttributeTranslator");
- var attributeNames = translator.getSupportedResultNames();
-
- while (true) {
- cocoon.sendPageAndWait("groups/profile.xml", {
- "page-title" : "Add Group",
- "group-id" : groupId,
- "name" : name,
- "rule" : rule,
- "description" : description,
- "messages" : messages,
- "new-group" : true,
- "attribute-names" : attributeNames
- });
-
- if (cocoon.request.getParameter("cancel")) {
- break;
- }
-
- messages.clear();
- groupId = cocoon.request.getParameter("group-id");
- name = cocoon.request.getParameter("name");
- description = cocoon.request.getParameter("description");
-
- if (groupManager.contains(groupId)) {
- messages.add(new Packages.org.apache.lenya.ac.Message("This group already exists."));
- }
- else if (!Packages.org.apache.lenya.ac.impl.AbstractItem.isValidId(groupId)) {
- messages.add(new Packages.org.apache.lenya.ac.Message("This is not a valid group ID."));
- }
- 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]);
- }
- }
- 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;
- }
- }
- }
- cocoon.redirectTo(redirectUri);
- }
- finally {
- release();
- }
+ resolve();
+ try {
+ var redirectUri = getRequestUri();
+
+ var groupManager = getAccreditableManager().getGroupManager();
+ var groupId = "";
+ var name = "";
+ var description = "";
+ var rule = "";
+ var messages = new java.util.ArrayList();
+
+ var translator = cocoon.getComponent("org.apache.lenya.ac.saml.AttributeTranslator");
+ var attributeNames = translator.getSupportedResultNames();
+
+ while (true) {
+ cocoon.sendPageAndWait("groups/profile.xml", {
+ "page-title" : "Add Group",
+ "group-id" : groupId,
+ "name" : name,
+ "rule" : rule,
+ "description" : description,
+ "messages" : messages,
+ "new-group" : true,
+ "attribute-names" : attributeNames
+ });
+
+ if (cocoon.request.getParameter("cancel")) {
+ break;
+ }
+
+ messages.clear();
+ groupId = cocoon.request.getParameter("group-id");
+ name = cocoon.request.getParameter("name");
+ description = cocoon.request.getParameter("description");
+
+ if (groupManager.contains(groupId)) {
+ messages.add(new Packages.org.apache.lenya.ac.Message("This group already exists."));
+ }
+ else if (!Packages.org.apache.lenya.ac.impl.AbstractItem.isValidId(groupId)) {
+ messages.add(new Packages.org.apache.lenya.ac.Message("This is not a valid group ID."));
+ }
+ 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]);
+ }
+ }
+ 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;
+ }
+ }
+ }
+ cocoon.redirectTo(redirectUri);
+ }
+ finally {
+ release();
+ }
}
//
@@ -262,43 +262,43 @@
//
function groupDeleteGroup() {
- resolve();
- try {
-
- var redirectUri = getRequestUri();
-
- var groupManager = getAccreditableManager().getGroupManager();
- var groupId = cocoon.request.getParameter("group-id");
- var group = groupManager.getGroup(groupId);
- var name = group.getName();
- var showPage = true;
-
- while (showPage) {
- cocoon.sendPageAndWait("groups/confirm-delete-common.xml", {
- "type" : "group",
- "id" : groupId,
- "name" : name
- });
-
- if (cocoon.request.getParameter("cancel")) {
- break;
- }
-
- if (cocoon.request.getParameter("submit")) {
- groupManager.remove(group);
- var members = group.getMembers();
- group['delete']();
- for (var i = 0; i < members.length; i++) {
- members[i].save();
- }
- showPage = false;
- }
- }
-
- cocoon.redirectTo(redirectUri);
- }
- finally {
- release();
- }
+ resolve();
+ try {
+
+ var redirectUri = getRequestUri();
+
+ var groupManager = getAccreditableManager().getGroupManager();
+ var groupId = cocoon.request.getParameter("group-id");
+ var group = groupManager.getGroup(groupId);
+ var name = group.getName();
+ var showPage = true;
+
+ while (showPage) {
+ cocoon.sendPageAndWait("groups/confirm-delete-common.xml", {
+ "type" : "group",
+ "id" : groupId,
+ "name" : name
+ });
+
+ if (cocoon.request.getParameter("cancel")) {
+ break;
+ }
+
+ if (cocoon.request.getParameter("submit")) {
+ groupManager.remove(group);
+ var members = group.getMembers();
+ group['delete']();
+ for (var i = 0; i < members.length; i++) {
+ members[i].save();
+ }
+ showPage = false;
+ }
+ }
+
+ cocoon.redirectTo(redirectUri);
+ }
+ finally {
+ release();
+ }
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.