Merge pull request #892 from ezsystems/ezp-22372-edit_wf_removed_user

Fix EZP-22372: Workflow cannot be edited if you remove a user and/or a group
ezsystems · Feb 26, 2014 · 29e32da · 29e32da
2 parents c98e521 + 498083a
commit 29e32da
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/kernel/classes/workflowtypes/event/ezapprove/ezapprovetype.php b/kernel/classes/workflowtypes/event/ezapprove/ezapprovetype.php
@@ -378,13 +378,30 @@ function validateGroupIDList( $userGroupIDList, &$reason )
         return $returnState;
     }
 
+    /**
+     * @param eZHTTPTool $http
+     * @param $base
+     * @param eZWorkflowEvent $workflowEvent
+     * @param $validation
+     *
+     * @return bool|int
+     */
     function validateHTTPInput( $http, $base, $workflowEvent, &$validation )
     {
         $returnState = eZInputValidator::STATE_ACCEPTED;
         $reason = array();
 
         if ( !$http->hasSessionVariable( 'BrowseParameters' ) )
         {
+            // No validation when deleting to avoid blocking deletion of invalid items
+            if (
+                $http->hasPostVariable( 'DeleteApproveUserIDArray_' . $workflowEvent->attribute( 'id' ) ) ||
+                $http->hasPostVariable( 'DeleteApproveGroupIDArray_' . $workflowEvent->attribute( 'id' ) )
+            )
+            {
+                return eZInputValidator::STATE_ACCEPTED;
+            }
+
             // check approve-users
             $approversIDs = array_unique( $this->attributeDecoder( $workflowEvent, 'approve_users' ) );
             if ( is_array( $approversIDs ) and