shuber 2005/10/12 11:47:08 CEST
Modified files:
core/src/java/org/jahia/engines/shared Application_Field.java
Log:
Bugfix : application roles where not properly set when adding a container.
Revision Changes Path
1.19 +27 -28
jahia/core/src/java/org/jahia/engines/shared/Application_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/Application_Field.java.diff?r1=1.18&r2=1.19&f=h
Index: Application_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/Application_Field.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Application_Field.java 27 Sep 2005 13:14:07 -0000 1.18
+++ Application_Field.java 12 Oct 2005 09:47:08 -0000 1.19
@@ -284,38 +284,37 @@
createGroup(0,
appID + "_" + theField.getID() +
"_" +
role, new Properties());
- } else {
- HashSet membersSet = getFormMembers(jParams, roleNb);
- Enumeration members = grp.members();
- Principal p = null;
- while (members.hasMoreElements()) {
- p = (Principal) members.nextElement();
- if (p instanceof JahiaUser) {
- if (!membersSet.contains((JahiaUser) p)) {
- logger.debug("removed member=" +
p.getName());
- grp.removeMember((JahiaUser)p);
- } else {
- membersSet.remove((JahiaUser)p);
- }
- } else if (p instanceof JahiaGroup) {
- if (!membersSet.contains((JahiaGroup) p)) {
- logger.debug("removed member=" +
p.getName());
- grp.removeMember( (JahiaGroup) p);
- } else {
- membersSet.remove((JahiaGroup)p);
- }
+ }
+ HashSet membersSet = getFormMembers(jParams, roleNb);
+ Enumeration members = grp.members();
+ Principal p = null;
+ while (members.hasMoreElements()) {
+ p = (Principal) members.nextElement();
+ if (p instanceof JahiaUser) {
+ if (!membersSet.contains((JahiaUser) p)) {
+ logger.debug("removed member=" +
p.getName());
+ grp.removeMember((JahiaUser)p);
+ } else {
+ membersSet.remove((JahiaUser)p);
}
- }
- Iterator it = membersSet.iterator();
- while (it.hasNext()) {
- p = (Principal) it.next();
- if (p instanceof JahiaUser) {
- grp.addMember( (JahiaUser) p);
- } else if (p instanceof JahiaGroup) {
- grp.addMember( (JahiaGroup) p);
+ } else if (p instanceof JahiaGroup) {
+ if (!membersSet.contains((JahiaGroup) p)) {
+ logger.debug("removed member=" +
p.getName());
+ grp.removeMember( (JahiaGroup) p);
+ } else {
+ membersSet.remove((JahiaGroup)p);
}
}
}
+ Iterator it = membersSet.iterator();
+ while (it.hasNext()) {
+ p = (Principal) it.next();
+ if (p instanceof JahiaUser) {
+ grp.addMember( (JahiaUser) p);
+ } else if (p instanceof JahiaGroup) {
+ grp.addMember( (JahiaGroup) p);
+ }
+ }
}
}
Boolean flushApp = new Boolean(false);
