You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/11/25 11:06:15 UTC
svn commit: r1206107 -
/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy
Author: hansbak
Date: Fri Nov 25 10:06:14 2011
New Revision: 1206107
URL: http://svn.apache.org/viewvc?rev=1206107&view=rev
Log:
Correction on rev 1206093
Modified:
ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy
Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy?rev=1206107&r1=1206106&r2=1206107&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy Fri Nov 25 10:06:14 2011
@@ -79,94 +79,9 @@ if (scrumUserLoginSecurityGroupList) {
}
context.userPreferenceList = userPreferenceOutList;
} else {
- if (security.hasEntityPermission("SCRUM", "_ADMIN", session)) {
- userPreferenceList = delegator.findByAnd("Enumeration", [enumTypeId : "SCRUM_PREFERENCE"], ["sequenceId"]);
- context.userPreferenceList = userPreferenceList;
- }
+ if (security.hasEntityPermission("SCRUM", "_ADMIN", session)) {
+ userPreferenceList = delegator.findByAnd("Enumeration", [enumTypeId : "SCRUM_PREFERENCE"], ["sequenceId"]);
+ context.userPreferenceList = userPreferenceList;
}
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
+}
-import org.ofbiz.entity.condition.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.util.EntityUtil;
-import org.ofbiz.entity.condition.EntityCondition;
-import org.ofbiz.entity.condition.EntityOperator;
-import javolution.util.FastList;
-
-partyId = parameters.partyId;
-
-andCond = FastList.newInstance();
-orCond = FastList.newInstance();
-combinedCondList = FastList.newInstance();
-
-andCond.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId));
-andCond.add(EntityCondition.makeCondition("partyStatusId", EntityOperator.EQUALS, "PARTY_ENABLED"));
-
-orCond.add(EntityCondition.makeCondition("groupId", EntityOperator.EQUALS, "SCRUM_PRODUCT_OWNER"));
-orCond.add(EntityCondition.makeCondition("groupId", EntityOperator.EQUALS, "SCRUM_MASTER"));
-orCond.add(EntityCondition.makeCondition("groupId", EntityOperator.EQUALS, "SCRUM_TEAM"));
-orCond.add(EntityCondition.makeCondition("enabled", EntityOperator.EQUALS, "Y"));
-orCond.add(EntityCondition.makeCondition("enabled", EntityOperator.EQUALS, null));
-
-orCondList = EntityCondition.makeCondition(orCond, EntityOperator.OR);
-andCondList = EntityCondition.makeCondition(andCond, EntityOperator.AND);
-
-combinedCondList.add(orCondList);
-combinedCondList.add(andCondList);
-
-combinedConds = EntityCondition.makeCondition(combinedCondList, EntityOperator.AND);
-
-scrumUserLoginSecurityGroupList = delegator.findList("ScrumMemberUserLoginAndSecurityGroup", combinedConds, null, null, null, false);
-userPreferenceList = [];
-userPreferenceOutList = [];
-if (scrumUserLoginSecurityGroupList) {
- scrumUserLoginSecurityGroupList.each { scrumUserLoginSecurityGroupMap ->
- if (scrumUserLoginSecurityGroupMap.groupId == "SCRUM_PRODUCT_OWNER") {
- ownerCond = FastList.newInstance();
- ownerCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE"));
- ownerCond.add(EntityCondition.makeCondition("enumId", EntityOperator.NOT_EQUAL, "MASTER_NOTIFY"));
- ownerConds = EntityCondition.makeCondition(ownerCond, EntityOperator.AND);
- userPreferenceList = delegator.findList("Enumeration" , ownerConds, null, null, null, false);
- } else if (scrumUserLoginSecurityGroupMap.groupId == "SCRUM_MASTER") {
- masterCond = FastList.newInstance();
- masterCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE"));
- masterCond.add(EntityCondition.makeCondition("enumId", EntityOperator.EQUALS, "MASTER_NOTIFY"));
- masterConds = EntityCondition.makeCondition(masterCond, EntityOperator.AND);
- userPreferenceList = delegator.findList("Enumeration" , masterConds, null, null, null, false);
- } /*else if (scrumUserLoginSecurityGroupMap.groupId == "SCRUM_TEAM") {
- teamCond = FastList.newInstance();
- teamCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE"));
- teamCond.add(EntityCondition.makeCondition("enumId", EntityOperator.EQUALS, "INVITE_NOTIFI"));
- teamConds = EntityCondition.makeCondition(teamCond, EntityOperator.AND);
- userPreferenceList = delegator.findList("Enumeration" , teamConds, null, null, null, false);
- }*/
- if (userPreferenceList) {
- userPreferenceList.each { userPreferenceMap ->
- userPreferenceOutList.add(userPreferenceMap);
- }
- }
- }
- context.userPreferenceList = userPreferenceOutList;
-} else {
- if (security.hasEntityPermission("SCRUM", "_ADMIN", session)) {
- userPreferenceList = delegator.findByAnd("Enumeration", [enumTypeId : "SCRUM_PREFERENCE"], ["sequenceId"]);
- context.userPreferenceList = userPreferenceList;
- }
- }