Author: xlawrence
Date: Mon Sep 24 14:47:55 2007
New Revision: 18630
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18630&repname=
=3Djahia
Log:
Resolve issue: http://www.jahia.net/jira/browse/JAHIA-2347: SP3: Multilang:=
Copy in other lang icon: I need to click twice on the icon in order to act=
ivate it (on boxes only)
The problem was actually happening on all engines displaying more than 1 co=
ntainer, due to a javascript clash. It has now been fixed.
We now also ignore values that start with <jahiaresource to detect if the f=
ield is in shared mode or not.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/Fields=
EditHelperAbstract.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/fieldedit.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
FieldsEditHelperAbstract.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/FieldsEditHelperAbstract.java&r=
ev=3D18630&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/fields/Fields=
EditHelperAbstract.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/Fields=
EditHelperAbstract.java Mon Sep 24 14:47:55 2007
@@ -506,7 +506,8 @@
final JahiaContentFieldFacade contentFieldFacade =3D jahiaContentC=
ontainerFacade.getContentFieldFacade(theField.getID());
final Enumeration fieldEnum =3D contentFieldFacade.getFields();
String oldValue =3D null;
- if (theField.getValue() =3D=3D null || theField.getValue().length(=
) =3D=3D 0) return false;
+ final String theFieldValue =3D theField.getValue();
+ if (theFieldValue =3D=3D null || theFieldValue.length() =3D=3D 0 |=
| theFieldValue.startsWith("<jahia-resource ")) return false;
while (fieldEnum.hasMoreElements()) {
final JahiaField field =3D (JahiaField) fieldEnum.nextElement(=
);
final String value =3D field.getValue();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/co=
ntaineredit/fieldedit.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/containeredit/fieldedit.inc&rev=
=3D18630&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/webapp/jsp/jahia/engines/containe=
redit/fieldedit.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/fieldedit.inc Mon Sep 24 14:47:55 2007
@@ -52,8 +52,8 @@
}
if (aField instanceof JahiaAllowApplyChangeToAllLangField) { %>
<script type=3D"text/javascript">
- function switchIcons(callingElementID) {
- var element =3D document.getElementById("apply_change_to_all_lang_=
<%=3DaField.getID()%>");
+ function switchIcons(callingElementID, inputElementID) {
+ var element =3D document.getElementById(inputElementID);
var callingElement =3D document.getElementById(callingElementID);
if (element) {
var theValue =3D element.value;
@@ -79,9 +79,9 @@
if (localeList.size() > 1 && !readOnlyMode && !aField.isShared() &&
ServicesRegistry.getInstance().getJahiaACLManagerService().hasWrit=
eAccesOnAllLangs(jParams)) { %>
<% if (allSameTitles) { %>
- <a id=3D"switchIcons_<%=3DaField.getID()%>" href=3D"javascript:switchI=
cons('switchIcons_<%=3DaField.getID()%>');" title=3D'<jahia:engineResourceB=
undle resourceName=3D"org.jahia.applyToAllLanguages.label"/>' class=3D"shar=
edLanguageYes"> </a>
+ <a id=3D"switchIcons_<%=3DaField.getID()%>" href=3D"javascript:switchI=
cons('switchIcons_<%=3DaField.getID()%>', 'apply_change_to_all_lang_<%=3DaF=
ield.getID()%>');" title=3D'<jahia:engineResourceBundle resourceName=3D"org=
.jahia.applyToAllLanguages.label"/>' class=3D"sharedLanguageYes"> </a>
<% } else { %>
- <a id=3D"switchIcons_<%=3DaField.getID()%>" href=3D"javascript:switchI=
cons('switchIcons_<%=3DaField.getID()%>');" title=3D'<jahia:engineResourceB=
undle resourceName=3D"org.jahia.applyToSingleLanguage.label"/>' class=3D"sh=
aredLanguageNo"> </a>
+ <a id=3D"switchIcons_<%=3DaField.getID()%>" href=3D"javascript:switchI=
cons('switchIcons_<%=3DaField.getID()%>', 'apply_change_to_all_lang_<%=3DaF=
ield.getID()%>');" title=3D'<jahia:engineResourceBundle resourceName=3D"org=
.jahia.applyToSingleLanguage.label"/>' class=3D"sharedLanguageNo"> </a>
<% } %>
<% } else { %>
<% if (aField.isShared() && localeList.size() > 1) { %>
@@ -93,6 +93,7 @@
<span class=3D"errorbold">(*)</span>
<% } %>
</h4>
+<% System.out.println("FATALLLLLLLLLLLLL: " + applyChangeToAllLang + "----=
" + allSameTitles); %>
<input id=3D"apply_change_to_all_lang_<%=3DaField.getID()%>" type=3D"h=
idden"
name=3D"apply_change_to_all_lang_<%=3DaField.getID()%>" value=
=3D"<%=3DapplyChangeToAllLang || allSameTitles %>"/>
<% if (errorMsg !=3D null && errorMsg.length() > 0) { %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
