Author: tdraier
Date: Fri Jul 13 12:04:03 2007
New Revision: 17996
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17996&repname=
=3Djahia
Log:
field creation optimization - ported missing changes from 17941
Modified:
trunk/core/src/java/org/jahia/data/fields/JahiaBooleanField.java
trunk/core/src/java/org/jahia/data/fields/JahiaCategoryField.java
trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java
trunk/core/src/java/org/jahia/data/fields/JahiaIntegerField.java
trunk/core/src/java/org/jahia/data/fields/JahiaPageField.java
trunk/core/src/java/org/jahia/data/fields/JahiaSmallTextSharedLangField=
.java
trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
eeProperties.js
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaBooleanField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaBooleanField.java&rev=3D17996&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/java/org/jahia/data/fields/JahiaBooleanField.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaBooleanField.java Fri Ju=
l 13 12:04:03 2007
@@ -26,11 +26,15 @@
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.fields.ContentBooleanField;
import org.jahia.services.fields.ContentField;
+import org.jahia.services.fields.ContentIntegerField;
+import org.jahia.services.fields.ContentFieldTools;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.version.EntrySaveRequest;
import org.jahia.sharing.FieldSharingManager;
=
import java.util.Properties;
+import java.util.Vector;
+import java.util.Hashtable;
=
public class JahiaBooleanField extends JahiaField implements JahiaSimpleFi=
eld, JahiaAllowApplyChangeToAllLangField {
=
@@ -107,17 +111,25 @@
=
// deprecated
// ServicesRegistry.getInstance().getJahiaFieldService().saveField=
( theField, 0, jParams );
- final ContentBooleanField contentField =3D (ContentBooleanField) C=
ontentField.getField(getID());
+ ContentBooleanField contentField =3D (ContentBooleanField) Content=
Field.getField(getID());
+ boolean isNew =3D false;
+ if (contentField =3D=3D null) {
+ contentField =3D (ContentBooleanField) ContentFieldTools.getIn=
stance().createContentFieldInstance(0,getJahiaID(), getPageID(), getctnid(),
+ getFieldDefID(), getType(), getConnectType(), getAclID=
(), new Vector(), new Hashtable());
+ contentField.setMetadataOwnerObjectKey(getMetadataOwnerObjectK=
ey());
+ isNew =3D true;
+ }
+
+
final String value =3D getValue();
final String savedValue =3D contentField.getValue(jParams);
=
- if (contentField.hasActiveEntries() && ((value =3D=3D null && save=
dValue =3D=3D null) || (value !=3D null && getValue().equals(savedValue))))=
{
+ if (((value =3D=3D null && savedValue =3D=3D null && !isNew) || (v=
alue !=3D null && getValue().equals(savedValue)))) {
return true;
}
- if (!((value =3D=3D null && savedValue =3D=3D null) || (value !=3D=
null && getValue().equals(savedValue)))) {
- jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
- logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
- }
+
+ jParams.getSessionState().setAttribute("FireContainerUpdated", "tr=
ue");
+ logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidateEsi=
InvalidateEsiInvalidateEsi");
=
final EntrySaveRequest saveRequest =3D new EntrySaveRequest(jParam=
s.getUser(), getLanguageCode());
try {
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaCategoryField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaCategoryField.java&rev=3D17996&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/java/org/jahia/data/fields/JahiaCategoryField.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaCategoryField.java Fri J=
ul 13 12:04:03 2007
@@ -26,12 +26,15 @@
import org.jahia.services.categories.Category;
import org.jahia.services.fields.ContentCategoryField;
import org.jahia.services.fields.ContentField;
+import org.jahia.services.fields.ContentSmallTextField;
+import org.jahia.services.fields.ContentFieldTools;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.sites.SiteLanguageSettings;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.version.EntrySaveRequest;
import org.jahia.sharing.FieldSharingManager;
import org.jahia.utils.LanguageCodeConverters;
+import org.jahia.engines.shared.Category_Field;
=
import java.util.*;
=
@@ -103,18 +106,27 @@
// -> no need to create a new one
=
//ServicesRegistry.getInstance().getJahiaFieldService().saveField(=
theField, 0, jParams );
- final ContentCategoryField contentField =3D (ContentCategoryField)=
ContentField.getField(getID());
+ ContentCategoryField contentField =3D (ContentCategoryField) Conte=
ntField.getField(getID());
+ boolean isNew =3D false;
+ if (contentField =3D=3D null) {
+ contentField =3D (ContentCategoryField) ContentFieldTools.getI=
nstance().createContentFieldInstance(0,getJahiaID(), getPageID(), getctnid(=
),
+ getFieldDefID(), getType(), getConnectType(), getAclID=
(), new Vector(), new Hashtable());
+ contentField.setMetadataOwnerObjectKey(getMetadataOwnerObjectK=
ey());
+ isNew =3D true;
+ }
=
final String value =3D getValue();
- final String savedValue =3D contentField.getValue(jParams);
- if (contentField.hasActiveEntries() && ((value =3D=3D null && save=
dValue =3D=3D null) || (value !=3D null && getValue().equals(savedValue))))=
{
- return true;
+ String savedValue =3D contentField.getValue(jParams);
+ if (savedValue !=3D null && savedValue.equals("")) {
+ savedValue =3D Category_Field.NOSELECTION_MARKER;
}
- if (!((value =3D=3D null && savedValue =3D=3D null) || (value !=3D=
null && getValue().equals(savedValue)))) {
- jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
- logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
+ if (((value =3D=3D null && savedValue =3D=3D null && !isNew) || (v=
alue !=3D null && getValue().equals(savedValue)))) {
+ return true;
}
- =
+
+ jParams.getSessionState().setAttribute("FireContainerUpdated", "tr=
ue");
+ logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidateEsi=
InvalidateEsiInvalidateEsi");
+
/*
if (contentField.hasActiveEntries() && getValue() !=3D null && get=
Value().equals(contentField.getValue(jParams))) {
return true;
@@ -123,6 +135,9 @@
contentField.setCategories(getValue(), saveRequest);
=
//ServicesRegistry.getInstance().getJahiaSearchService().indexCont=
ainer(this.getctnid(), jParams.getUser());
+ if (getID() =3D=3D 0) {
+ setID(contentField.getID());
+ }
=
return true;
}
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaDateField.java&rev=3D17996&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/java/org/jahia/data/fields/JahiaDateField.java (original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java Fri Jul 1=
3 12:04:03 2007
@@ -25,6 +25,8 @@
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.fields.ContentDateField;
import org.jahia.services.fields.ContentField;
+import org.jahia.services.fields.ContentSmallTextField;
+import org.jahia.services.fields.ContentFieldTools;
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.pages.JahiaPageService;
import org.jahia.services.version.EntryLoadRequest;
@@ -142,22 +144,32 @@
// deprecated
//ServicesRegistry.getInstance().getJahiaFieldService().saveField(=
theField, 0, jParams );
=
- final ContentDateField contentField =3D (ContentDateField) Content=
Field.getField(getID());
+ ContentDateField contentField =3D (ContentDateField) ContentField.=
getField(getID());
+ boolean isNew =3D false;
+ if (contentField =3D=3D null) {
+ contentField =3D (ContentDateField) ContentFieldTools.getInsta=
nce().createContentFieldInstance(0,getJahiaID(), getPageID(), getctnid(),
+ getFieldDefID(), getType(), getConnectType(), getAclID=
(), new Vector(), new Hashtable());
+ contentField.setMetadataOwnerObjectKey(getMetadataOwnerObjectK=
ey());
+ isNew =3D true;
+ }
+
final String value =3D getValue();
final String savedValue =3D contentField.getValue(jParams);
=
- if (contentField.hasActiveEntries() && ((value =3D=3D null && save=
dValue =3D=3D null) || (value !=3D null && getValue().equals(savedValue))))=
{
+ if (((value =3D=3D null && savedValue =3D=3D null && !isNew) || (v=
alue !=3D null && getValue().equals(savedValue)))) {
return true;
}
=
- if (!((value =3D=3D null && savedValue =3D=3D null) || (value !=3D=
null && getValue().equals(savedValue)))) {
- jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
- logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
- }
+ jParams.getSessionState().setAttribute("FireContainerUpdated", "tr=
ue");
+ logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidateEsi=
InvalidateEsiInvalidateEsi");
=
try {
final EntrySaveRequest saveRequest =3D new EntrySaveRequest(jP=
arams.getUser(), getLanguageCode());
contentField.setValue(getValue(), saveRequest);
+
+ if (getID() =3D=3D 0) {
+ setID(contentField.getID());
+ }
//ServicesRegistry.getInstance().getJahiaSearchService().index=
Container(
// this.getctnid(), jParams.getUser());
} catch (Throwable t) {
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaIntegerField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaIntegerField.java&rev=3D17996&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/java/org/jahia/data/fields/JahiaIntegerField.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaIntegerField.java Fri Ju=
l 13 12:04:03 2007
@@ -26,11 +26,15 @@
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.fields.ContentField;
import org.jahia.services.fields.ContentIntegerField;
+import org.jahia.services.fields.ContentSmallTextField;
+import org.jahia.services.fields.ContentFieldTools;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.services.version.EntrySaveRequest;
import org.jahia.sharing.FieldSharingManager;
=
import java.util.Properties;
+import java.util.Vector;
+import java.util.Hashtable;
=
public class JahiaIntegerField extends JahiaField implements JahiaSimpleFi=
eld, JahiaAllowApplyChangeToAllLangField {
=
@@ -112,27 +116,31 @@
// deprecated
// ServicesRegistry.getInstance().getJahiaFieldService().saveField=
( theField, 0, jParams );
=
- final ContentIntegerField contentField =3D (ContentIntegerField) C=
ontentField.getField(getID());
+ ContentIntegerField contentField =3D (ContentIntegerField) Content=
Field.getField(getID());
+ boolean isNew =3D false;
+ if (contentField =3D=3D null) {
+ contentField =3D (ContentIntegerField) ContentFieldTools.getIn=
stance().createContentFieldInstance(0,getJahiaID(), getPageID(), getctnid(),
+ getFieldDefID(), getType(), getConnectType(), getAclID=
(), new Vector(), new Hashtable());
+ contentField.setMetadataOwnerObjectKey(getMetadataOwnerObjectK=
ey());
+ isNew =3D true;
+ }
+
final String value =3D getValue();
final String savedValue =3D contentField.getValue(jParams);
=
- if (contentField.hasActiveEntries() && ((value =3D=3D null && save=
dValue =3D=3D null) || (value !=3D null && getValue().equals(savedValue))))=
{
+ if (((value =3D=3D null && savedValue =3D=3D null && !isNew) || (v=
alue !=3D null && getValue().equals(savedValue)))) {
return true;
}
- if (!((value =3D=3D null && savedValue =3D=3D null) || (value !=3D=
null && getValue().equals(savedValue)))) {
- jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
- logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
- }
- /*
- if (getValue().equals(contentField.getValue(jParams))) {
- return true;
- }*/
+
+ jParams.getSessionState().setAttribute("FireContainerUpdated", "tr=
ue");
+ logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidateEsi=
InvalidateEsiInvalidateEsi");
+
try {
+ final EntrySaveRequest saveRequest =3D new EntrySaveRequest(jP=
arams.getUser(), getLanguageCode());
if (!"<empty>".equals(getValue()) && getValue().length() > 0) {
- final EntrySaveRequest saveRequest =3D new EntrySaveReques=
t(jParams.getUser(), getLanguageCode());
contentField.setInteger((Integer.valueOf(getValue())).intV=
alue(), saveRequest);
} else {
- return false;
+ contentField.unsetValue(saveRequest);
}
//ServicesRegistry.getInstance().getJahiaSearchService().index=
Container(this.getctnid(), jParams.getUser());
} catch (Throwable t) {
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaPageField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaPageField.java&rev=3D17996&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/java/org/jahia/data/fields/JahiaPageField.java (original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaPageField.java Fri Jul 1=
3 12:04:03 2007
@@ -29,9 +29,12 @@
import org.jahia.exceptions.JahiaException;
import org.jahia.exceptions.JahiaPageNotFoundException;
import org.jahia.params.ProcessingContext;
+import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.fields.ContentField;
import org.jahia.services.fields.ContentPageField;
+import org.jahia.services.fields.ContentDateField;
+import org.jahia.services.fields.ContentFieldTools;
import org.jahia.services.pages.ContentPage;
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.pages.JahiaPageDefinition;
@@ -41,9 +44,12 @@
import org.jahia.services.workflow.WorkflowService;
import org.jahia.settings.SettingsBean;
import org.jahia.utils.JahiaConsole;
+import org.jahia.resourcebundle.JahiaResourceBundle;
=
import java.util.Properties;
import java.util.Set;
+import java.util.Vector;
+import java.util.Hashtable;
=
public class JahiaPageField extends JahiaField {
final private static org.apache.log4j.Logger logger =3D org.apache.log=
4j.Logger.
@@ -137,7 +143,7 @@
if (jParams !=3D null) {
try {
if (!ContentPageXRefManager.getIns=
tance().isPageXRefByPage(thePage.getID(), jParams.getPageID())) {
- ContentPageXRefManager.getInst=
ance().setPageID(thePage.getID(), jParams.getPageID()); =
=
+ ContentPageXRefManager.getInst=
ance().setPageID(thePage.getID(), jParams.getPageID());
}
} catch (Throwable t) {
logger.debug("Exception registerin=
g page cross reference", t);
@@ -196,7 +202,7 @@
// flag the page as moved
thePage.setMoved(true);
}
- } =
=
+ }
} else {
this.setObject(null);
if (this.getValue().toUpperCase().inde=
xOf("JAHIA_LINKONLY") =3D=3D -1) {
@@ -273,17 +279,23 @@
} catch (NumberFormatException e) {
}
=
- final ContentPageField contentField =3D (ContentPageField) Content=
Field.getField(this.getID());
+ ContentPageField contentField =3D (ContentPageField) ContentField.=
getField(this.getID());
+ boolean isNew =3D false;
+ if (contentField =3D=3D null) {
+ contentField =3D (ContentPageField) ContentFieldTools.getInsta=
nce().createContentFieldInstance(0,getJahiaID(), getPageID(), getctnid(),
+ getFieldDefID(), getType(), getConnectType(), getAclID=
(), new Vector(), new Hashtable());
+ contentField.setMetadataOwnerObjectKey(getMetadataOwnerObjectK=
ey());
+ isNew =3D true;
+ }
final String value =3D getValue();
final String savedValue =3D contentField.getValue(jParams);
=
- if (contentField.hasActiveEntries() && ((value =3D=3D null && save=
dValue =3D=3D null) || (value !=3D null && getValue().equals(savedValue))))=
{
+ if (((value =3D=3D null && savedValue =3D=3D null && !isNew) || (v=
alue !=3D null && getValue().equals(savedValue)))) {
return true;
}
- if (!((value =3D=3D null && savedValue =3D=3D null) || (value !=3D=
null && getValue().equals(savedValue)))) {
- jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
- logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
- }
+
+ jParams.getSessionState().setAttribute("FireContainerUpdated", "tr=
ue");
+ logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidateEsi=
InvalidateEsiInvalidateEsi");
=
try {
WorkflowService.getInstance().flushCacheForPageCreatedOrDelete=
d(new ContentPageKey(Integer.parseInt(contentField.getValue(jParams))));
@@ -291,6 +303,7 @@
}
=
String tmpVal =3D this.getValue();
+ int pageIDToSet =3D -1;
if (!tmpVal.equals("<empty>")) {
int pageID =3D -1;
try {
@@ -317,15 +330,14 @@
this.setValue("");
}
}
- }
- int pageIDToSet;
- try {
pageIDToSet =3D Integer.parseInt(this.getValue());
- } catch (NumberFormatException nfe) {
- pageIDToSet =3D -1;
}
+
contentField.setPageID(pageIDToSet, jParams.getUser());
=
+ if (getID() =3D=3D 0) {
+ setID(contentField.getID());
+ }
/* handled by contentPageField.setPageID() call
// index page
if ( pageUpdated ){
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaSmallTextSharedLan=
gField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaSmallTextSharedLangField.java&rev=3D17996&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/java/org/jahia/data/fields/JahiaSmallTextSharedLangField=
.java (original)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaSmallTextSharedLangField=
.java Fri Jul 13 12:04:03 2007
@@ -26,6 +26,8 @@
import org.jahia.resourcebundle.ResourceBundleMarker;
import org.jahia.services.fields.ContentField;
import org.jahia.services.fields.ContentSmallTextSharedLangField;
+import org.jahia.services.fields.ContentSmallTextField;
+import org.jahia.services.fields.ContentFieldTools;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.sites.SiteLanguageSettings;
import org.jahia.services.version.EntryLoadRequest;
@@ -114,34 +116,36 @@
// -> field already has an aclID
// -> no need to create a new one
=
- //ServicesRegistry.getInstance().getJahiaFieldService().saveField(=
theField, 0, jParams );
- final ContentSmallTextSharedLangField contentField =3D (ContentSma=
llTextSharedLangField) ContentField.getField(getID());
+ ContentSmallTextSharedLangField contentField =3D (ContentSmallText=
SharedLangField) ContentField.getField(getID());
+ boolean isNew =3D false;
+ if (contentField =3D=3D null) {
+ contentField =3D (ContentSmallTextSharedLangField) ContentFiel=
dTools.getInstance().createContentFieldInstance(0,getJahiaID(), getPageID()=
, getctnid(),
+ getFieldDefID(), getType(), getConnectType(), getAclID=
(), new Vector(), new Hashtable());
+ contentField.setMetadataOwnerObjectKey(getMetadataOwnerObjectK=
ey());
+ isNew =3D true;
+ }
=
final String value =3D getValue();
final String savedValue =3D contentField.getValue(jParams);
=
- if (contentField.hasActiveEntries() && ((value =3D=3D null && save=
dValue =3D=3D null) || (value !=3D null && getValue().equals(savedValue))))=
{
- if ( !contentField.isMetadata() ||
- (!this.getDefinition().getName().equals(CoreMetadataCo=
nstant.LAST_CONTRIBUTOR)
- && !this.getDefinition().getName().equals(CoreMetadata=
Constant.LAST_MODIFICATION_DATE)) ){
- return true;
- }
+ if (((value =3D=3D null && savedValue =3D=3D null && !isNew) || (v=
alue !=3D null && getValue().equals(savedValue)))) {
+ return true;
}
=
- if (!((value =3D=3D null && savedValue =3D=3D null) || (value !=3D=
null && getValue().equals(savedValue)))) {
- jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
- logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
- }
+ jParams.getSessionState().setAttribute("FireContainerUpdated", "tr=
ue");
+ logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidateEsi=
InvalidateEsiInvalidateEsi");
=
- logger.debug("getValue(): " + getValue());
- logger.debug("contentField.getValue(jParams): " + contentField.get=
Value(jParams));
- /*
- if (contentField.hasActiveEntries() && getValue() !=3D null && get=
Value().equals(contentField.getValue(jParams))) {
- return true;
- }*/
+ if(logger.isDebugEnabled()) {
+ logger.debug("getValue(): " + value);
+ logger.debug("contentField.getValue(jParams): " + savedValue);
+ }
final EntrySaveRequest saveRequest =3D new EntrySaveRequest(jParam=
s.getUser(), getLanguageCode());
- contentField.setText(getValue(), saveRequest);
- //ServicesRegistry.getInstance().getJahiaSearchService().indexCont=
ainer(this.getctnid(), jParams.getUser());
+ contentField.setText(value=3D=3Dnull?"":value, saveRequest);
+
+ if (getID() =3D=3D 0) {
+ setID(contentField.getID());
+ }
+
return true;
}
=
Modified: trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/Com=
plexTreeProperties.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/javascript/zimbra/complexTree/ComplexTreeProperties.js&rev=3D179=
96&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/javascript/zimbra/complexTree/ComplexTr=
eeProperties.js (original)
+++ trunk/core/src/webapp/jsp/jahia/javascript/zimbra/complexTree/ComplexTr=
eeProperties.js Fri Jul 13 12:04:03 2007
@@ -241,6 +241,7 @@
=
ComplexTreeProperties.getFileTypeImageTbnail =3D
function (ext, key) {
+ alert(ext);
if (ext =3D=3D "dir") {
return ComplexTreeProperties.CONTEXT + "/jsp/jahia/engines/images/=
types/tbnail/folder.gif";
}
@@ -251,7 +252,8 @@
}
=
var thName =3D key.substring(0, key.length - 4);
- thName +=3D "_th_64." + ext;
+ alert(thName);
+ thName +=3D "_txxxh_64." + ext;
=
return ComplexTreeProperties.webdavPath + thName;
} else {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
