Author: tdraier
Date: Mon Jun 25 14:54:02 2007
New Revision: 17742
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17742&repname=
=3Djahia
Log:
create all fields when adding new container (JAHIA-1941, JAHIA-1948) ( back=
port 17389 )
Modified:
trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.=
java
Modified: trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_E=
ngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/addcontainer/AddContainer_Engine.java&rev=3D17742&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/engines/addcontainer/AddContainer_Engine.=
java (original)
+++ trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.=
java Mon Jun 25 14:54:02 2007
@@ -892,32 +892,30 @@
int newAclID =3D 0;
while (fields.hasMoreElements()) {
final JahiaField field =3D (JahiaField) fields.nextElement=
();
- if (feh.containsUpdatedField(field.getID(), field.getLangu=
ageCode())) {
- field.setID(newFieldID);
- if (newAclID !=3D 0) {
- field.setAclID(newAclID);
- }
- field.setctnid(theContainer.getID());
+ field.setID(newFieldID);
+ if (newAclID !=3D 0) {
+ field.setAclID(newAclID);
+ }
+ field.setctnid(theContainer.getID());
=
- final EntryLoadRequest processingEntryLoadRequest =3D
- new EntryLoadRequest(field.getWorkflowState(),=
field.getVersionID(), new ArrayList());
- processingEntryLoadRequest.getLocales().add(LanguageCo=
deConverters.languageCodeToLocale(
- field.getLanguageCode()));
-
- jParams.setSubstituteEntryLoadRequest(processingEntryL=
oadRequest);
- if (field.getID() =3D=3D 0) {
- // create the field only once
- ServicesRegistry.getInstance().getJahiaFieldServic=
e().
- saveField(field, theContainer.getAclID(), =
jParams);
- }
- EngineToolBox.getInstance().processFieldTypes(field, t=
heContainer, ENGINE_NAME, jParams, mode, engineMap);
- jParams.resetSubstituteEntryLoadRequest();
- if (newFieldID =3D=3D 0) {
- newFieldID =3D field.getID();
- }
- if (newAclID =3D=3D 0) {
- newAclID =3D field.getAclID();
- }
+ final EntryLoadRequest processingEntryLoadRequest =3D
+ new EntryLoadRequest(field.getWorkflowState(), fie=
ld.getVersionID(), new ArrayList());
+ processingEntryLoadRequest.getLocales().add(LanguageCodeCo=
nverters.languageCodeToLocale(
+ field.getLanguageCode()));
+
+ jParams.setSubstituteEntryLoadRequest(processingEntryLoadR=
equest);
+ if (field.getID() =3D=3D 0) {
+ // create the field only once
+ ServicesRegistry.getInstance().getJahiaFieldService().
+ saveField(field, theContainer.getAclID(), jPar=
ams);
+ }
+ EngineToolBox.getInstance().processFieldTypes(field, theCo=
ntainer, ENGINE_NAME, jParams, mode, engineMap);
+ jParams.resetSubstituteEntryLoadRequest();
+ if (newFieldID =3D=3D 0) {
+ newFieldID =3D field.getID();
+ }
+ if (newAclID =3D=3D 0) {
+ newAclID =3D field.getAclID();
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
