Author: bpapez
Date: Fri Aug 17 16:14:21 2007
New Revision: 18204
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18204&repname=
=3Djahia
Log:
Multiline Smalltext fields can be enabled with the field definition propert=
y JahiaFieldDefinitionProperties.FIELD_MULTILINE_SMALLTEXT_PROP
Modified:
trunk/core/src/java/org/jahia/data/containers/ContainerValidatorBase.ja=
va
trunk/core/src/java/org/jahia/data/fields/JahiaFieldDefinitionPropertie=
s.java
trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp
Modified: trunk/core/src/java/org/jahia/data/containers/ContainerValidatorB=
ase.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/ContainerValidatorBase.java&rev=3D18204&repname=3D=
jahia
=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
--- trunk/core/src/java/org/jahia/data/containers/ContainerValidatorBase.ja=
va (original)
+++ trunk/core/src/java/org/jahia/data/containers/ContainerValidatorBase.ja=
va Fri Aug 17 16:14:21 2007
@@ -44,9 +44,6 @@
private static final org.apache.log4j.Logger logger =3D org.apache.log=
4j.Logger
.getLogger(ContainerValidatorBase.class);
=
- private static String strToRemove[] =3D {"<JAHIA", "<JAHIA", "</JAH=
IA", "</JAHIA", "_MULTILINE>", "_MULTILINE>"};
-
-
protected ContainerFacadeInterface cf =3D null;
=
protected ProcessingContext jParams =3D null;
@@ -149,7 +146,7 @@
break;
=
default:
- field =3D removeJahiaKeywords(newJf.getValue()=
);
+ field =3D newJf.getValue();
break;
}
}
@@ -250,7 +247,7 @@
=
default:
field.addMltItem(newJf.getLanguageCode(),
- removeJahiaKeywords(newJf.getValue=
()));
+ newJf.getValue());
break;
}
}
@@ -363,50 +360,6 @@
return str.trim();
}
=
- /*
- * Remove Jahia keywords from a string
- * @author PAP
- * @version 1.0 PAP 03/01/2006
- * @param str Input String
- * @return str
- **/
- private String removeJahiaKeywords(String theSelectedField) {
-
- if (theSelectedField !=3D null) {
- String upperCaseField =3D theSelectedField.toUpperCase();
- if (upperCaseField.indexOf("JAHIA_MULTILINE") !=3D -1) {
-
- if (!upperCaseField.startsWith("<JAHIA-RESOURCE")
- && !upperCaseField.startsWith("<JAHIA-EXPRESSIO=
N")) {
- for (int i =3D 0; i < strToRemove.length; i++) {
- int index =3D upperCaseField.indexOf(strToRemove[i=
]);
- if (index !=3D -1) {
- upperCaseField =3D upperCaseField.substring(0,=
index)
- + upperCaseField.substring(index
- + strToRemove[i].length(),
- upperCaseField.length());
-
- theSelectedField =3D theSelectedField.substrin=
g(0,
- index)
- + theSelectedField.substring(index
- + strToRemove[i].length(),
- theSelectedField.length());
- }
- }
- }
-
- if (theSelectedField.indexOf("[") !=3D -1) {
- int startStr =3D theSelectedField.indexOf("[");
- int endStr =3D theSelectedField.indexOf("]>") + 2;
- theSelectedField =3D theSelectedField.substring(0, sta=
rtStr)
- + theSelectedField.substring(endStr,
- theSelectedField.length());
- }
- }
- }
- return theSelectedField;
- }
-
public Object invoke(Object object, Method method, Object[] objects) t=
hrows Throwable {
logger.debug("Calling method " + method.getName());
if (method.getName().startsWith("get")) {
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaFieldDefinitionPro=
perties.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaFieldDefinitionProperties.java&rev=3D18204&repnam=
e=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
--- trunk/core/src/java/org/jahia/data/fields/JahiaFieldDefinitionPropertie=
s.java (original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaFieldDefinitionPropertie=
s.java Fri Aug 17 16:14:21 2007
@@ -30,4 +30,10 @@
* linking or moving pages.
*/
public static final String PAGE_SELECTION_FILTER_PROP =3D "page_select=
ion_filter_prop"; =
+ =
+ /**
+ * This property can be used for SmallText and SharedSmallText fields.=
Set the value =
+ * to true, if you want to display a multi-line input field instead of=
a single-line.
+ */
+ public static final String FIELD_MULTILINE_SMALLTEXT_PROP =3D "field_m=
ultiline_smalltext_prop"; =
}
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/smalltext_field.jsp&rev=3D18204&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp (ori=
ginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp Fri =
Aug 17 16:14:21 2007
@@ -19,6 +19,7 @@
<%@ page import=3D"org.jahia.data.JahiaData" %>
<%@ page import=3D"org.jahia.data.fields.ExpressionMarker" %>
<%@ page import=3D"org.jahia.data.fields.JahiaField" %>
+<%@ page import=3D"org.jahia.data.fields.JahiaFieldDefinitionProperties"%>
<%@ page import=3D"org.jahia.engines.EngineLanguageHelper" %>
<%@ page import=3D"org.jahia.engines.JahiaEngine" %>
<%@ page import=3D"org.jahia.gui.GuiBean" %>
@@ -333,24 +334,6 @@
=
document.mainForm.elements['_<%=3DtheField.getID()%>'].value =3D conca=
tMultipleFieldValues(document.mainForm.listSelection_<%=3DcontextID%>);
</script>
-<% } else if (defValue !=3D null &&
- ! defValue.equals("") &&
- defValue.toUpperCase().indexOf("JAHIA_MULTILINE") !=3D -1) {
- =
- String val =3D JahiaTools.replacePattern(theField.getValue(),"\"","\\\=
"");
-
- String strToRemove[] =3D {"<JAHIA_MULTILINE>", "<JAHIA_MULTILINE=
>","</JAHIA_MULTILINE>","</JAHIA_MULTILINE>","<JAHIA_MULTILINE>","=
</JAHIA_MULTILINE>"};
-
- if ( val !=3D null) {
- for (int i =3D 0; i < strToRemove.length; i++) {
- int index =3D val.indexOf(strToRemove[i]);
- if (index !=3D -1) {
- val =3D val.substring(0, index) + val.substring(index +
strTo=
Remove[i].length(), val.length());
- }
- }
- }
-%> =
-<textarea id=3D"field_<%=3DtheField.getID()%>" name=3D"_<%=3DtheField.getI=
D()%>" rows=3D"3" cols=3D"100" style=3D"width:98%" <% if ( readOnly ){%> di=
sabled=3D"disabled"<% } %>><%=3Dval%></textarea>
<% } else { %>
<%
final String val;
@@ -359,10 +342,14 @@
} else {
val =3D ExpressionMarker.getValue(theField.getRawValue(), jParams);
}
+ if ("true".equals(theField.getDefinition().getProperty(JahiaFieldDefin=
itionProperties.FIELD_MULTILINE_SMALLTEXT_PROP))) { =
%>
+<textarea id=3D"field_<%=3DtheField.getID()%>" name=3D"_<%=3DtheField.getI=
D()%>" rows=3D"3" cols=3D"100" style=3D"width:98%" <% if ( readOnly ){%> di=
sabled=3D"disabled"<% } %>><%=3Dval%></textarea>
+<%} else { %>
<input id=3D"field_<%=3DtheField.getID()%>" name=3D"_<%=3DtheField.getID()=
%>" style=3D"width:98%" type=3D"text" maxlength=3D"250" value=3D"<%=3Dval%>"
<% if ( readOnly ){%> disabled=3D"disabled"<% } %> >
<%
+}
}
} catch (JahiaException je) {
logger.fatal("Error displaying SmallText: " + je.getMessage(), je);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
