Author: tdraier
Date: Fri Jan 25 12:40:55 2008
New Revision: 19580
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19580&repname=
=3Djahia
Log:
fixed field creation / correctly set id after create
Modified:
trunk/core/src/java/org/jahia/data/fields/JahiaApplicationField.java
trunk/core/src/java/org/jahia/data/fields/JahiaBooleanField.java
trunk/core/src/java/org/jahia/data/fields/JahiaDateField.java
trunk/core/src/java/org/jahia/data/fields/JahiaFloatField.java
trunk/core/src/java/org/jahia/data/fields/JahiaIntegerField.java
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaApplicationField.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaApplicationField.java&rev=3D19580&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/JahiaApplicationField.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaApplicationField.java Fr=
i Jan 25 12:40:55 2008
@@ -208,6 +208,11 @@
appID =3D Integer.parseInt(this.getValue());
} catch (NumberFormatException e) {
contentField.unsetValue(saveRequest);
+
+ if (getID() =3D=3D 0) {
+ setID(contentField.getID());
+ }
+
return true;
}
ApplicationBean app =3D ServicesRegistry.getInstance()=
.getApplicationsManagerService().
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=3D19580&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 Ja=
n 25 12:40:55 2008
@@ -135,6 +135,11 @@
try {
contentField.setValue((Boolean.valueOf(getValue())).booleanVal=
ue(), saveRequest);
//ServicesRegistry.getInstance().getJahiaSearchService().index=
Container(this.getctnid(), jParams.getUser());
+
+ if (getID() =3D=3D 0) {
+ setID(contentField.getID());
+ }
+
} catch (Throwable t) {
t.printStackTrace();
return false;
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=3D19580&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 Jan 2=
5 12:40:55 2008
@@ -1,18 +1,18 @@
/*
* Copyright 2002-2006 Jahia Ltd
*
- * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL), =
- * Version 1.0 (the "License"), or (at your option) any later version; you=
may =
- * not use this file except in compliance with the License. You should hav=
e =
- * received a copy of the License along with this program; if not, you may=
obtain =
- * a copy of the License at =
+ * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL),
+ * Version 1.0 (the "License"), or (at your option) any later version; you=
may
+ * not use this file except in compliance with the License. You should have
+ * received a copy of the License along with this program; if not, you may=
obtain
+ * a copy of the License at
*
* http://www.jahia.org/license/
*
- * Unless required by applicable law or agreed to in writing, software =
- * distributed under the License is distributed on an "AS IS" BASIS, =
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
- * See the License for the specific language governing permissions and =
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
* limitations under the License.
*/// JahiaDateField
// YG 08.08.2001
@@ -73,8 +73,8 @@
this.fieldRawValue =3D "";
this.objectItem =3D "";
}
- } =
- =
+ }
+
if (isShared()) {
this.languageCode =3D ContentField.SHARED_LANGUAGE;
}
Modified: trunk/core/src/java/org/jahia/data/fields/JahiaFloatField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/JahiaFloatField.java&rev=3D19580&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/JahiaFloatField.java (origina=
l)
+++ trunk/core/src/java/org/jahia/data/fields/JahiaFloatField.java Fri Jan =
25 12:40:55 2008
@@ -140,6 +140,11 @@
contentField.unsetValue(saveRequest);
}
//ServicesRegistry.getInstance().getJahiaSearchService().index=
Container(this.getctnid(), jParams.getUser());
+
+ if (getID() =3D=3D 0) {
+ setID(contentField.getID());
+ }
+
} catch (Throwable t) {
logger.warn("Float value could not be set", t);
return false;
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=3D19580&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 Ja=
n 25 12:40:55 2008
@@ -142,6 +142,11 @@
} else {
contentField.unsetValue(saveRequest);
}
+
+ if (getID() =3D=3D 0) {
+ setID(contentField.getID());
+ }
+
//ServicesRegistry.getInstance().getJahiaSearchService().index=
Container(this.getctnid(), jParams.getUser());
} catch (Throwable t) {
logger.warn("Integer value could not be set", t);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
