cmailleux 2005/03/15 11:57:42 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/data/containers ContainerValidatorBase.java
src/views/jsp/jahia/engines/addcontainer addcontainer.jsp
Log:
Last update from Benjamin Papez
* Here are again some changes. There was a bug with PAGE types, where the
title was "shared" for all languages.
* Furthermore I changed addcontainer.jsp to make a line break after the
detailed validation error message for those types, which have an own form (like
PAGE).
Revision Changes Path
1.1.2.5 +49 -25
jahia/src/java/org/jahia/data/containers/ContainerValidatorBase.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/containers/ContainerValidatorBase.java.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
1.47.2.1.2.3 +1 -1
jahia/src/views/jsp/jahia/engines/addcontainer/addcontainer.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/addcontainer/addcontainer.jsp.diff?r1=1.47.2.1.2.2&r2=1.47.2.1.2.3&f=h
Index: ContainerValidatorBase.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/containers/Attic/ContainerValidatorBase.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ContainerValidatorBase.java 3 Mar 2005 16:33:14 -0000 1.1.2.4
+++ ContainerValidatorBase.java 15 Mar 2005 10:57:42 -0000 1.1.2.5
@@ -28,7 +28,7 @@
*
* The Shared Modifications are Jahia View Helper.
*
- * The Developer of the Shared Modifications is Jahia Solution S?rl.
+ * The Developer of the Shared Modifications is Jahia Solution S�rl.
* Portions created by the Initial Developer are Copyright (C) 2002 by the
* Initial Developer. All Rights Reserved.
*
@@ -48,6 +48,7 @@
import org.jahia.engines.validation.JahiaMltHelper;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ParamBean;
+import org.jahia.services.pages.JahiaPage;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.utils.LanguageCodeConverters;
@@ -131,7 +132,17 @@
JahiaPageEngineTempBean pageBean =
(JahiaPageEngineTempBean)pageBeans
.get(newJf.getDefinition().getName());
- field = pageBean.getTitle(languageCode);
+ field = "";
+ if (pageBean != null){
+ if ("shared".equals(newJf.getLanguageCode())) {
+ if (pageBean.getTitles().size() > 0)
+ field = (String)pageBean.getTitles()
+ .values().iterator().next();
+ } else
+ field = pageBean.getTitle(newJf.getLanguageCode());
+ } else if (newJf.getObject() != null) {
+ field = ((JahiaPage)newJf.getObject()).getTitle();
+ }
break;
case FieldTypes.BIGTEXT:
@@ -156,7 +167,7 @@
break;
case FieldTypes.APPLICATION:
- field = newJf.getObject().toString();
+ field = (newJf.getObject() != null ?
newJf.getObject().toString() : "");
break;
default:
@@ -200,7 +211,6 @@
while (fieldsPerLanguage.hasMoreElements())
{
-
JahiaField newJf = (JahiaField)fieldsPerLanguage.nextElement();
if (fieldName.equals(newJf.getDefinition().getName()))
@@ -209,52 +219,66 @@
field = new JahiaMltHelper(jParams.getSite()
.getLanguageSettings());
- switch (newJf.getType())
- {
+ switch (newJf.getType()) {
case FieldTypes.PAGE:
- HashMap pageBeans =
(HashMap)jParams.getSession().getAttribute(
- "Page_Field.PageBeans");
- if (pageBeans == null)
- {
+ HashMap pageBeans = (HashMap) jParams.getSession()
+ .getAttribute("Page_Field.PageBeans");
+ if (pageBeans == null) {
pageBeans = new HashMap();
}
- JahiaPageEngineTempBean pageBean =
(JahiaPageEngineTempBean)pageBeans
- .get(newJf.getDefinition().getName());
-
- field.addMltItem(newJf.getLanguageCode(), pageBean
- .getTitle(newJf.getLanguageCode()));
+ JahiaPageEngineTempBean pageBean = (JahiaPageEngineTempBean)
+ pageBeans.get(newJf.getDefinition().getName());
+
+ String title = "";
+ if (pageBean != null){
+ if ("shared".equals(newJf.getLanguageCode())) {
+ if (pageBean.getTitles().size() > 0)
+ title = (String)pageBean.getTitles()
+ .values().iterator().next();
+ } else
+ title = pageBean.getTitle(newJf.getLanguageCode());
+ } else if (newJf.getObject() != null) {
+ title = ((JahiaPage)newJf.getObject()).getTitle();
+ }
+ field.addMltItem(newJf.getLanguageCode(), title);
break;
case FieldTypes.BIGTEXT:
- field.addMltItem(newJf.getLanguageCode(),
+ field.addMltItem(newJf.getLanguageCode(),
removeDefaultHtmlTags(newJf.getValue()));
break;
case FieldTypes.DATE:
if (newJf.getValue() != null
- &&
newJf.getValue().toUpperCase().indexOf("JAHIA_CALENDAR") != -1)
+ && newJf.getValue().toUpperCase().indexOf(
+ "JAHIA_CALENDAR") != -1)
field.addMltItem(newJf.getLanguageCode(), "");
else
- field.addMltItem(newJf.getLanguageCode(),
newJf.getValue());
+ field.addMltItem(newJf.getLanguageCode(),
+ newJf.getValue());
break;
case FieldTypes.FILE:
if (newJf.getValue() != null
- && newJf.getValue().toUpperCase().indexOf("<EMPTY>") != -1)
+ && newJf.getValue().toUpperCase().indexOf(
+ "<EMPTY>") != -1)
field.addMltItem(newJf.getLanguageCode(), "");
else
- field.addMltItem(newJf.getLanguageCode(), FormDataManager
- .getInstance().removeSpecialTags(newJf.getValue()));
+ field.addMltItem(newJf.getLanguageCode(),
+ FormDataManager.getInstance()
+ .removeSpecialTags(newJf.getValue()));
break;
case FieldTypes.APPLICATION:
- field.addMltItem(newJf.getLanguageCode(), newJf.getObject()
- .toString());
+ field.addMltItem(newJf.getLanguageCode(),
+ (newJf.getObject() != null ?
+ newJf.getObject().toString() : ""));
break;
-
+
default:
- field.addMltItem(newJf.getLanguageCode(), newJf.getValue());
+ field.addMltItem(newJf.getLanguageCode(),
+ newJf.getValue());
break;
}
}
Index: addcontainer.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/addcontainer/Attic/addcontainer.jsp,v
retrieving revision 1.47.2.1.2.2
retrieving revision 1.47.2.1.2.3
diff -u -r1.47.2.1.2.2 -r1.47.2.1.2.3
--- addcontainer.jsp 23 Feb 2005 10:02:43 -0000 1.47.2.1.2.2
+++ addcontainer.jsp 15 Mar 2005 10:57:42 -0000 1.47.2.1.2.3
@@ -277,7 +277,7 @@
<b><%=theField.getDefinition().getTitle(pageDefID,activeLocale)%></b> : <%=errorMsg%>
<% if( localeList.size()>1
){%><br>[ <span class="input"><input type="checkbox"
name="apply_change_to_all_lang_<%=theField.getID()%>"
value="<%=theField.getID()%>" <%if(theField.isShared()){%>disabled
checked<%}else{ if(applyChangeToAllLang){%>checked<%}}%>> : <font
size="1"><jahia:engineResourceBundle
resourceName="org.jahia.applyToAllLanguages.label"
/></font></span> ]<br/><%} else { %><br/> <%}%>
<% }
- else {%><%=errorMsg%><%}
+ else {%><%=errorMsg%><br/><%}
%>
<%=fieldForm%>
<% } %>
