knguyen 2004/08/03 16:07:42 CEST
Modified files:
core/src/java/org/jahia/services/fields ContentField.java
Log:
- fix mandatory language and validation of marked for delete container
Revision Changes Path
1.5 +3 -2 jahia/core/src/java/org/jahia/services/fields/ContentField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/fields/ContentField.java.diff?r1=1.4&r2=1.5&f=h
Index: ContentField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/fields/ContentField.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContentField.java 3 Aug 2004 13:28:12 -0000 1.4
+++ ContentField.java 3 Aug 2004 14:07:42 -0000 1.5
@@ -705,8 +705,9 @@
// skip test mandatory language if we're going to delete it
int now = new Long(System.currentTimeMillis()/1000).intValue();
- if ( (contentContainer == null || !(contentContainer.isMarkedForDelete() ||
contentContainer.isDeleted(now)) )
- || !(this.isDeleted((now)) || this.isMarkedForDelete()) ){
+ if ( ((contentContainer == null) && !(this.isDeleted((now)) ||
this.isMarkedForDelete()))
+ || ((contentContainer != null) &&
!((contentContainer.isMarkedForDelete() || contentContainer.isDeleted(now)) )
+ && !(this.isDeleted((now)) || this.isMarkedForDelete()) ) ){
// first we must test if we have all the mandatory languages in our
// field
