Changeset 29674

Timestamp:

01/27/08 17:28:42 (10 months ago)

Author:

atchertchian

Message:

NXP-2015: cannot delete an approved document

Files:

• org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/resources/OSGI-INF/LifeCycleCoreExtensions.xml (modified) (3 diffs)
• org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/action/DeleteActionsBean.java (modified) (2 diffs)

org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/resources/OSGI-INF/LifeCycleCoreExtensions.xml

@@ -4 +4 @@
-
-  <documentation>
-  
+
-
-  
-  
+
+
-  </documentation>
-
-
+
+
+
-
- 
-  
+
+
-
-    <documentation>
@@ -45 +47 @@
-          </transitions>
-        </state>
-
+
+
+
+
+
-        <state name="obsolete" description="Content is obsolete">
-          <transitions>
@@ -61 +67 @@
-
-  <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
-      
+
-
-    <documentation>

org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/action/DeleteActionsBean.java

@@ -506 +506 @@
-                document.followTransition(DELETE_TRANSITION);
-            } else {
+                // FIXME: should be checked sooner so that no exception is thrown
-                throw new ClientException("Impossible to move document="
-                        + docModel.getPathAsString()
@@ -865 +866 @@
-    }
-
+    // FIXME: should check permissions
-    public boolean getCanRestoreCurrentDoc() throws ClientException {
-        DocumentModel currentDoc = navigationContext.getCurrentDocument();