Author: xlawrence
Date: Mon Sep 17 17:22:05 2007
New Revision: 18520
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18520&repname=
=3Djahia
Log:
Correctly check the 2 single list types available in order to prevent unaut=
horized addition of containers
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/url/AddCon=
tainerURLTag.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/C=
ontainerListBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/beans/ContainerListBean.java&rev=3D185=
20&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java Mon Sep 17 17:22:05 2007
@@ -418,7 +418,9 @@
JahiaContainerDefinition.CONTAINER_LIST_TYPE_PROPERTY)=
);
final boolean canAddContainer;
final int listSize =3D theList.getJahiaContainerList(processin=
gContext, processingContext.getEntryLoadRequest()).getFullSize();
- if (containerListTypePropValue !=3D JahiaContainerDefinition.S=
TANDARD_TYPE) {
+ if (containerListTypePropValue =3D=3D JahiaContainerDefinition=
.SINGLE_TYPE) {
+ canAddContainer =3D (listSize =3D=3D 0); =
+ } else if (containerListTypePropValue =3D=3D JahiaContainerDef=
inition.SINGLE_MANDATORY_TYPE) {
canAddContainer =3D (listSize =3D=3D 0);
} else {
canAddContainer =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/url/=
AddContainerURLTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/url/AddContainerURLTag.java&rev=3D1=
8520&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/url/AddCon=
tainerURLTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/url/AddCon=
tainerURLTag.java Mon Sep 17 17:22:05 2007
@@ -108,7 +108,9 @@
JahiaContainerDefinition.CONTAINER_LIST_TYPE_PROPE=
RTY));
final boolean canAddContainer;
final int listSize =3D containerList.getFullSize();
- if (containerListTypePropValue !=3D JahiaContainerDefiniti=
on.STANDARD_TYPE) {
+ if (containerListTypePropValue =3D=3D JahiaContainerDefini=
tion.SINGLE_TYPE) {
+ canAddContainer =3D (listSize =3D=3D 0);
+ } else if (containerListTypePropValue =3D=3D JahiaContaine=
rDefinition.SINGLE_MANDATORY_TYPE) {
canAddContainer =3D (listSize =3D=3D 0);
} else {
canAddContainer =3D true;
@@ -136,7 +138,9 @@
JahiaContainerDefinition.CONTAINER_LIST_TYPE_PROPE=
RTY));
final boolean canAddContainer;
final int listSize =3D containerList.getFullSize();
- if (containerListTypePropValue !=3D JahiaContainerDefiniti=
on.STANDARD_TYPE) {
+ if (containerListTypePropValue =3D=3D JahiaContainerDefini=
tion.SINGLE_TYPE) {
+ canAddContainer =3D (listSize =3D=3D 0);
+ } else if (containerListTypePropValue =3D=3D JahiaContaine=
rDefinition.SINGLE_MANDATORY_TYPE) {
canAddContainer =3D (listSize =3D=3D 0);
} else {
canAddContainer =3D true;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
