Author: bpapez
Date: Mon Aug 6 17:08:09 2007
New Revision: 18143
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18143&repname=
=3Djahia
Log:
change the multiline field option to be set vie field definition properties=
rather than by default value
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/containers/ContainerV=
alidatorBase.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/fields/JahiaFieldDefi=
nitionProperties.java
branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/shared/smalltext_=
field.jsp
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/containers/Cont=
ainerValidatorBase.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/data/containers/ContainerValidatorBase.java&rev=3D1=
8143&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-4-1-BRANCH/src/java/org/jahia/data/containers/ContainerV=
alidatorBase.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/containers/ContainerV=
alidatorBase.java Mon Aug 6 17:08:09 2007
@@ -65,9 +65,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 ParamBean jParams =3D null;
@@ -161,7 +158,7 @@
break;
=
default:
- field =3D removeJahiaKeywords(newJf.getValue());
+ field =3D newJf.getValue();
break;
}
}
@@ -251,7 +248,7 @@
break;
=
default:
- field.addMltItem(newJf.getLanguageCode(), remo=
veJahiaKeywords(newJf.getValue()));
+ field.addMltItem(newJf.getLanguageCode(), newJ=
f.getValue());
break;
}
}
@@ -357,39 +354,6 @@
return str.trim();
}
=
- 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 + s=
trToRemove[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, theSelect=
edField.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: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/fields/JahiaFie=
ldDefinitionProperties.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/data/fields/JahiaFieldDefinitionProperties.java&rev=
=3D18143&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-4-1-BRANCH/src/java/org/jahia/data/fields/JahiaFieldDefi=
nitionProperties.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/data/fields/JahiaFieldDefi=
nitionProperties.java Mon Aug 6 17:08:09 2007
@@ -14,4 +14,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: branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/shared/smal=
ltext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/views/jsp/jahia/engines/shared/smalltext_field.jsp&rev=3D18143&rep=
name=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-4-1-BRANCH/src/views/jsp/jahia/engines/shared/smalltext_=
field.jsp (original)
+++ branches/JAHIA-4-1-BRANCH/src/views/jsp/jahia/engines/shared/smalltext_=
field.jsp Mon Aug 6 17:08:09 2007
@@ -326,37 +326,6 @@
// -->
</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_MULTILI=
NE>","</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"120"><%=3Dval%></textarea>
-<% if ( isSelectedField.booleanValue() ){ %>
-<SCRIPT type=3D"text/javascript">
- <!--
- function setfocus() {
- document.mainForm.elements["_<%=3DtheField.getID()%>"].focus();
- document.mainForm.elements["_<%=3DtheField.getID()%>"].select(=
);
- }
- setfocus();
-
- // -->
-</SCRIPT>
-
-<% }
} else { =
final String val;
if(!theField.getRawValue().startsWith("<jahia-expression")) {
@@ -364,9 +333,14 @@
} else {
val =3D ExpressionMarker.getValue(theField.getRawValue(), jParams);
}
+ if ("true".equals(theField.getDefinition().getProperty(JahiaFieldDef=
initionProperties.FIELD_MULTILINE_SMALLTEXT_PROP))) { =
%>
-<input class=3D"input" id=3D"field_<%=3DtheField.getID()%>" name=3D"_<%=3D=
theField.getID()%>" size=3D"120" type=3D"text" maxlength=3D"250" value=3D"<=
%=3Dval%>" onkeypress=3D"return smallKeyPressed(event)"><br>
-<% if (isSelectedField.booleanValue()) { %>
+<textarea id=3D"field_<%=3DtheField.getID()%>" name=3D"_<%=3DtheField.getI=
D()%>" rows=3D"3" cols=3D"80"><%=3Dval%></textarea>
+<%} else { %>
+<input class=3D"input" id=3D"field_<%=3DtheField.getID()%>" name=3D"_<%=3D=
theField.getID()%>" size=3D"120" type=3D"text" maxlength=3D"250" value=3D"<=
%=3Dval%>" onkeypress=3D"return smallKeyPressed(event)">
+<%}%>
+<br>
+<%if (isSelectedField.booleanValue()) { %>
<SCRIPT type=3D"text/javascript">
<!--
function setfocus() {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
