shuber 2005/10/12 14:23:26 CEST
Modified files:
core/src/java/org/jahia/engines/addcontainer
AddContainer_Engine.java
core/src/java/org/jahia/engines/containerlistproperties
ContainerListProperties_Engine.java
core/src/java/org/jahia/engines/pages
PageProperties_Engine.java
core/src/java/org/jahia/engines/updatecontainer
UpdateContainer_Engine.java
core/src/java/org/jahia/engines/updatefield
UpdateField_Engine.java
core/src/webapp/jsp/jahia/engines tools.inc
Log:
Hide versioning and content definition engines in a more correct way.
Revision Changes Path
1.31 +1 -1
jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java.diff?r1=1.30&r2=1.31&f=h
1.18 +1 -1
jahia/core/src/java/org/jahia/engines/containerlistproperties/ContainerListProperties_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/containerlistproperties/ContainerListProperties_Engine.java.diff?r1=1.17&r2=1.18&f=h
1.29 +3 -3
jahia/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java.diff?r1=1.28&r2=1.29&f=h
1.31 +1 -1
jahia/core/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Engine.java.diff?r1=1.30&r2=1.31&f=h
1.19 +2 -2
jahia/core/src/java/org/jahia/engines/updatefield/UpdateField_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/updatefield/UpdateField_Engine.java.diff?r1=1.18&r2=1.19&f=h
1.6 +4 -6 jahia/core/src/webapp/jsp/jahia/engines/tools.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/tools.inc.diff?r1=1.5&r2=1.6&f=h
Index: AddContainer_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AddContainer_Engine.java 10 Oct 2005 16:22:16 -0000 1.30
+++ AddContainer_Engine.java 12 Oct 2005 12:23:24 -0000 1.31
@@ -1023,7 +1023,7 @@
}
engineMap.put("enableCategories", Boolean.TRUE);
- engineMap.put("enableContentDefinition", Boolean.TRUE);
+ // engineMap.put("enableContentDefinition", Boolean.TRUE);
engineMap.remove(JahiaEngine.ENGINE_VALIDATION_HELPER);
// sets engineMap for JSPs
Index: ContainerListProperties_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/containerlistproperties/ContainerListProperties_Engine.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ContainerListProperties_Engine.java 29 Sep 2005 15:55:04 -0000
1.17
+++ ContainerListProperties_Engine.java 12 Oct 2005 12:23:24 -0000
1.18
@@ -844,7 +844,7 @@
if (theContainerList.getID () != 0) {
engineMap.put ("enableCategories", new Boolean (true));
}
- engineMap.put("enableContentDefinition", Boolean.TRUE);
+ // engineMap.put("enableContentDefinition", Boolean.TRUE);
// sets engineMap for JSPs
jParams.setAttribute ("engineTitle",
Index: PageProperties_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- PageProperties_Engine.java 7 Oct 2005 12:45:28 -0000 1.28
+++ PageProperties_Engine.java 12 Oct 2005 12:23:24 -0000 1.29
@@ -1,4 +1,4 @@
-// $Id: PageProperties_Engine.java,v 1.28 2005/10/07 12:45:28 knguyen Exp $
+// $Id: PageProperties_Engine.java,v 1.29 2005/10/12 12:23:24 shuber Exp $
//
//
// ____.
@@ -746,12 +746,12 @@
engineMap.put("jspSource", TEMPLATE_JSP);
}
- engineMap.put("enableVersioning", new Boolean(true));
+ // engineMap.put("enableVersioning", new Boolean(true));
engineMap.put("enableCategories", new Boolean(true));
engineMap.put("enableTimeBasedPublishing", Boolean.TRUE);
engineMap.put("enableAdvancedWorkflow", new Boolean(true));
// engineMap.put("enableImportExport", Boolean.TRUE);
- engineMap.put("enableContentDefinition", Boolean.TRUE);
+ // engineMap.put("enableContentDefinition", Boolean.TRUE);
// sets engineMap for JSPs
jParams.setAttribute ("engineTitle", "Page properties");
Index: UpdateContainer_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Engine.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- UpdateContainer_Engine.java 7 Oct 2005 16:27:44 -0000 1.30
+++ UpdateContainer_Engine.java 12 Oct 2005 12:23:25 -0000 1.31
@@ -939,7 +939,7 @@
if (ContentContainer.getContainer(ctnid).getPickedObject() == null) {
engineMap.put("enableCategories", new Boolean(true));
- engineMap.put("enableContentDefinition", Boolean.TRUE);
+ // engineMap.put("enableContentDefinition", Boolean.TRUE);
}
// sets engineMap for JSPs
Index: UpdateField_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/updatefield/UpdateField_Engine.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- UpdateField_Engine.java 29 Sep 2005 15:55:24 -0000 1.18
+++ UpdateField_Engine.java 12 Oct 2005 12:23:25 -0000 1.19
@@ -136,14 +136,14 @@
engineMap.put("enableMetadata", Boolean.TRUE);
engineMap.put ("adminAccess", Boolean.TRUE);
engineMap.put ("enableRightView", Boolean.TRUE);
- engineMap.put("enableContentDefinition", Boolean.TRUE);
+ // engineMap.put("enableContentDefinition", Boolean.TRUE);
engineMap.put ("enableAdvancedWorkflow", Boolean.TRUE);
engineMap.put ("writeAccess", Boolean.TRUE);
} else if (theField.checkWriteAccess (user)) {
engineMap.put("enableAuthoring", Boolean.TRUE);
engineMap.put("enableMetadata", Boolean.TRUE);
engineMap.put ("writeAccess", Boolean.TRUE);
- engineMap.put("enableContentDefinition", Boolean.TRUE);
+ // engineMap.put("enableContentDefinition", Boolean.TRUE);
}
if (engineMap.get ("writeAccess") != null) {
Index: tools.inc
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/tools.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tools.inc 10 Oct 2005 09:57:02 -0000 1.5
+++ tools.inc 12 Oct 2005 12:23:26 -0000 1.6
@@ -15,10 +15,9 @@
}
Boolean enableVersioning = (Boolean) engineMap.get("enableVersioning");
-// temporarely deactivated until they are completely migrated to the new look
-// if (enableVersioning == null) {
+ if (enableVersioning == null) {
enableVersioning = Boolean.FALSE;
-// }
+ }
Boolean enableImport = (Boolean) engineMap.get("enableImport");
if (enableImport == null) {
@@ -31,10 +30,9 @@
}
Boolean enableContentDefinition = (Boolean)
engineMap.get("enableContentDefinition");
-// temporarely deactivated until they are completely migrated to the new look
-// if (enableContentDefinition == null) {
+ if (enableContentDefinition == null) {
enableContentDefinition = Boolean.FALSE;
-// }
+ }
Boolean enableAdvancedWorkflow = (Boolean)
engineMap.get("enableAdvancedWorkflow");
if (enableAdvancedWorkflow == null) {
