fixed merge conflict

CHANGELOG.md

@@ -3,7 +3,9 @@ Version 1.3
 
 * Implemented the help text of an action on the edit action screen.
 * Changed the implementation of the civicrm_container hook.
-* Fix for converting Title into Name
+* Added a File type for handling the upload of files.
+* Fix for converting Title into Name.
+* Fixed issue with updating status with overridden.
 
 Version 1.2
 ===========

CRM/FormProcessor/BAO/FormProcessorInstance.php

@@ -5,6 +5,8 @@
  */
  
  class CRM_FormProcessor_BAO_FormProcessorInstance extends CRM_FormProcessor_DAO_FormProcessorInstance {
+
+   static $importingFormProcessors = array();
  	
 	/**
    * Function to get values
@@ -252,5 +254,34 @@
     $params[3] = array($source_file, 'String');
     CRM_Core_DAO::executeQuery($sql, $params);
   }
+
+   /**
+    * Update the status from in code to overriden when a form processor has been changed
+    *
+    * @param $formProcessorId
+    */
+   public static function updateAndChekStatus($formProcessorId) {
+     $sql = "SELECT `status`, `name` FROM `civicrm_form_processor_instance` WHERE `id` = %1";
+     $params[1] = array($formProcessorId, 'Integer');
+     $dao = CRM_Core_DAO::executeQuery($sql, $params);
+     if ($dao->fetch()) {
+       if (!in_array($dao->name, self::$importingFormProcessors) && $dao->status == CRM_FormProcessor_Status::IN_CODE) {
+         $sql = "UPDATE `civicrm_form_processor_instance` SET `status` = %2 WHERE `id` = %1";
+         $params[1] = array($formProcessorId, 'String');
+         $params[2] = array(CRM_FormProcessor_Status::OVERRIDDEN, 'Integer');
+         CRM_Core_DAO::executeQuery($sql, $params);
+       }
+     }
+   }
+
+   /**
+    * Store the form processor name so we know that we are importing this form processor
+    * and should not update its status on the way.
+    *
+    * @param $formProcessorName
+    */
+   public static function setFormProcessorToImportingState($formProcessorName) {
+     self::$importingFormProcessors[] = $formProcessorName;
+   }
 	
  }

Civi/FormProcessor/API/Exception.php

+<?php
+/**
+ * @author Jaap Jansma <jaap.jansma@civicoop.org>
+ * @license AGPL-3.0
+ */
+
+namespace Civi\FormProcessor\API;
+
+use Throwable;
+
+class Exception extends \Exception {
+
+  public function __construct($actionName, Throwable $previous = NULL) {
+    $message = "Action ".$actionName." failed.";
+    if ($previous) {
+      $message .= " Caused by ".$previous->getMessage();
+    }
+    parent::__construct($message, null, $previous);
+  }
+
+}
\ No newline at end of file

Civi/FormProcessor/API/FormProcessor.php

@@ -204,9 +204,13 @@
       } else {
         // There is no delay. Execute the action immediately
         // Now execute the action
-        $outputBag = $actionClass->execute($mappedParameterBag, $mappedConditionParameterBag, $mappedConditionOutputParameterBag);
-        // Add the output of the action to the data bag of this action.
-        $dataBag->setActionDataFromActionProviderParameterBag($objAction, $outputBag);
+        try {
+          $outputBag = $actionClass->execute($mappedParameterBag, $mappedConditionParameterBag, $mappedConditionOutputParameterBag);
+          // Add the output of the action to the data bag of this action.
+          $dataBag->setActionDataFromActionProviderParameterBag($objAction, $outputBag);
+        } catch (\Exception $e) {
+          throw new Exception($action['title'], $e);
+        }
       }
 		}
 		

Civi/FormProcessor/API/FormProcessorDefaults.php

@@ -177,11 +177,14 @@
       $condition = \CRM_FormProcessor_Condition::getConditionClass($action['condition_configuration']);
       $actionClass->setCondition($condition);
 
-      // Now execute the action
-      $outputBag = $actionClass->execute($mappedParameterBag, $mappedConditionParameterBag, $mappedConditionOutputParameterBag);
-
-			// Add the output of the action to the data bag of this action.
-			$dataBag->setActionDataFromActionProviderParameterBag($objAction, $outputBag);
+      try {
+        // Now execute the action
+        $outputBag = $actionClass->execute($mappedParameterBag, $mappedConditionParameterBag, $mappedConditionOutputParameterBag);
+        // Add the output of the action to the data bag of this action.
+        $dataBag->setActionDataFromActionProviderParameterBag($objAction, $outputBag);
+      } catch (\Exception $e) {
+        throw new Exception($action['title'], $e);
+      }
 		}
 		
 		$return = array();

Civi/FormProcessor/Exporter/ExportToJson.php

@@ -73,6 +73,8 @@ class ExportToJson {
     $status = \CRM_FormProcessor_BAO_FormProcessorInstance::getStatus($data['name']);
     $new_status = null;
     $new_id = null;
+
+    \CRM_FormProcessor_BAO_FormProcessorInstance::setFormProcessorToImportingState($data['name']);
     
     switch ($status) {
       case \CRM_FormProcessor_Status::IN_DATABASE:

Civi/FormProcessor/Type/Factory.php

@@ -34,6 +34,7 @@
     $this->addType(new MailingGroupType('MailingGroup', E::ts('Mailing Group')));
     $this->addType(new ParticipantStatusType('ParticipantStatusType', E::ts('Participant Status')));
     $this->addType(new CampaignType('CampaignType', E::ts('Campaign')));
+    $this->addType(new FileType('file', E::ts('File')));
 	}
 	
 	/**

Civi/FormProcessor/Type/FileType.php

+<?php
+
+/**
+ * @author Jaap Jansma (CiviCooP) <jaap.jansma@civicoop.org>
+ * @license http://www.gnu.org/licenses/agpl-3.0.html
+ */
+ 
+ namespace Civi\FormProcessor\Type;
+ 
+ use \Civi\FormProcessor\Type\GenericType;
+ use \Civi\FormProcessor\Config\Specification;
+ use \Civi\FormProcessor\Config\SpecificationBag;
+
+ use \CRM_FormProcessor_ExtensionUtil as E;
+ 
+ class FileType extends GenericType {
+
+
+	
+	/**
+	 * Get the configuration specification.
+	 * 
+	 * The configuration is 
+	 *   format: a string containing the input format.
+	 *           see for valid formats http://nl1.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters
+	 * 
+	 * @return SpecificationBag
+	 */
+	public function getConfigurationSpecification() {
+		return new SpecificationBag(array());
+	}
+
+	public function validateValue($value, $allValues=array()) {
+    if (!is_array($value)) {
+      return false;
+    }
+    if (!isset($value['id'])) {
+      if (!isset($value['name']) || !isset($value['mime_type']) || !isset($value['content'])) {
+        return false;
+      }
+    }
+	  return true;
+
+  }
+
+   /**
+    * Returns the type number from CRM_Utils_Type
+    */
+   public function getCrmType() {
+     return \CRM_Utils_Type::T_BLOB;
+   }
+	
+ }
\ No newline at end of file

api/v3/FormProcessorAction/Create.php

@@ -82,6 +82,7 @@ function _civicrm_api3_form_processor_action_create_spec(&$spec) {
  */
 function civicrm_api3_form_processor_action_create($params) {
   $returnValue = CRM_FormProcessor_BAO_FormProcessorAction::add($params);
+  CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($returnValue['form_processor_instance_id']);
 	$returnValues[$returnValue['id']] = $returnValue;
   return civicrm_api3_create_success($returnValues, $params, 'FormProcessorAction', 'Create');
 }

api/v3/FormProcessorAction/Delete.php

@@ -31,6 +31,8 @@ function civicrm_api3_form_processor_action_Delete($params) {
   if (!array_key_exists('id', $params) || empty($params['id'])) {
     throw new API_Exception('Parameter id is mandatory and can not be empty in ' . __METHOD__, 0010);
   } else {
+    $formProcessorId = civicrm_api3('FormProcessorAction', 'getvalue', array('id' => $params['id'], 'return' => 'form_processor_instance_id'));
+    CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($formProcessorId);
     return civicrm_api3_create_success(CRM_FormProcessor_BAO_FormProcessorAction::deleteWithId($params['id']), $params, 'FormProcessorAction', 'Delete');
   }
 }

api/v3/FormProcessorDefaultDataAction/Create.php

@@ -66,6 +66,7 @@ function _civicrm_api3_form_processor_default_data_action_create_spec(&$spec) {
  */
 function civicrm_api3_form_processor_default_data_action_create($params) {
   $returnValue = CRM_FormProcessor_BAO_FormProcessorDefaultDataAction::add($params);
+  CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($returnValue['form_processor_instance_id']);
 	$returnValues[$returnValue['id']] = $returnValue;
   return civicrm_api3_create_success($returnValues, $params, 'FormProcessorDefaultDataAction', 'Create');
 }

api/v3/FormProcessorDefaultDataAction/Delete.php

@@ -31,6 +31,8 @@ function civicrm_api3_form_processor_default_data_action_Delete($params) {
   if (!array_key_exists('id', $params) || empty($params['id'])) {
     throw new API_Exception('Parameter id is mandatory and can not be empty in ' . __METHOD__, 0010);
   } else {
+    $formProcessorId = civicrm_api3('FormProcessorDefaultDataAction', 'getvalue', array('id' => $params['id'], 'return' => 'form_processor_instance_id'));
+    CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($formProcessorId);
     return civicrm_api3_create_success(CRM_FormProcessor_BAO_FormProcessorDefaultDataAction::deleteWithId($params['id']), $params, 'FormProcessorDefaultDataAction', 'Delete');
   }
 }

api/v3/FormProcessorDefaultDataInput/Create.php

@@ -62,6 +62,7 @@ function _civicrm_api3_form_processor_default_data_input_create_spec(&$spec) {
  */
 function civicrm_api3_form_processor_default_data_input_create($params) {
   $returnValue = CRM_FormProcessor_BAO_FormProcessorDefaultDataInput::add($params);
+  CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($returnValue['form_processor_instance_id']);
 	$returnValues[$returnValue['id']] = $returnValue;
   return civicrm_api3_create_success($returnValues, $params, 'FormProcessorDefaultDataInput', 'Create');
 }

api/v3/FormProcessorDefaultDataInput/Delete.php

@@ -31,6 +31,8 @@ function civicrm_api3_form_processor_default_data_input_Delete($params) {
   if (!array_key_exists('id', $params) || empty($params['id'])) {
     throw new API_Exception('Parameter id is mandatory and can not be empty in ' . __METHOD__, 0010);
   } else {
+    $formProcessorId = civicrm_api3('FormProcessorDefaultDataInput', 'getvalue', array('id' => $params['id'], 'return' => 'form_processor_instance_id'));
+    CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($formProcessorId);
     return civicrm_api3_create_success(CRM_FormProcessor_BAO_FormProcessorDefaultDataInput::deleteWithId($params['id']), $params, 'FormProcessorDefaultDataInput', 'Delete');
   }
 }

api/v3/FormProcessorInput/Create.php

@@ -67,6 +67,7 @@ function _civicrm_api3_form_processor_input_create_spec(&$spec) {
  */
 function civicrm_api3_form_processor_input_create($params) {
   $returnValue = CRM_FormProcessor_BAO_FormProcessorInput::add($params);
+  CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($returnValue['form_processor_instance_id']);
 	$returnValues[$returnValue['id']] = $returnValue;
   return civicrm_api3_create_success($returnValues, $params, 'FormProcessorInput', 'Create');
 }

api/v3/FormProcessorInput/Delete.php

@@ -31,6 +31,8 @@ function civicrm_api3_form_processor_input_Delete($params) {
   if (!array_key_exists('id', $params) || empty($params['id'])) {
     throw new API_Exception('Parameter id is mandatory and can not be empty in ' . __METHOD__, 0010);
   } else {
+    $formProcessorId = civicrm_api3('FormProcessorInput', 'getvalue', array('id' => $params['id'], 'return' => 'form_processor_instance_id'));
+    CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($formProcessorId);
     return civicrm_api3_create_success(CRM_FormProcessor_BAO_FormProcessorInput::deleteWithId($params['id']), $params, 'FormProcessorInput', 'Delete');
   }
 }

api/v3/FormProcessorInstance/Create.php

@@ -101,6 +101,7 @@ function civicrm_api3_form_processor_instance_create($params) {
   }
 
   $returnValue = CRM_FormProcessor_BAO_FormProcessorInstance::add($params);
+  CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($returnValue['id']);
 	$returnValues[$returnValue['id']] = $returnValue;
   return civicrm_api3_create_success($returnValues, $params, 'FormProcessorInstance', 'Create');
 }

api/v3/FormProcessorValidation/Create.php

@@ -50,6 +50,10 @@ function _civicrm_api3_form_processor_validation_create_spec(&$spec) {
  */
 function civicrm_api3_form_processor_validation_create($params) {
   $returnValue = CRM_FormProcessor_BAO_FormProcessorValidation::add($params);
+
+  $formProcessorId = civicrm_api3($params['entity'], 'getvalue', array('id' => $params['entity_id'], 'return' => 'form_processor_instance_id'));
+  CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($formProcessorId);
+
 	$returnValues[$returnValue['id']] = $returnValue;
   return civicrm_api3_create_success($returnValues, $params, 'FormProcessorValidation', 'Create');
 }

api/v3/FormProcessorValidation/Delete.php

@@ -31,6 +31,11 @@ function civicrm_api3_form_processor_validation_Delete($params) {
   if (!array_key_exists('id', $params) || empty($params['id'])) {
     throw new API_Exception('Parameter id is mandatory and can not be empty in ' . __METHOD__, 0010);
   } else {
+
+    $validation = civicrm_api3('FormProcessorValidation', 'getsingle', array('id' => $params['id']));
+    $formProcessorId = civicrm_api3($validation['entity'], 'getvalue', array('id' => $validation['entity_id'], 'return' => 'form_processor_instance_id'));
+    CRM_FormProcessor_BAO_FormProcessorInstance::updateAndChekStatus($formProcessorId);
+
     return civicrm_api3_create_success(CRM_FormProcessor_BAO_FormProcessorValidation::deleteWithId($params['id']), $params, 'FormProcessorValidation', 'Delete');
   }
 }