Conflicts

workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php

@@ -1178,7 +1178,9 @@ class DynaForm
                 }
                 foreach ($oldColumns as $oldColumn) {
                     if (strtolower(AdditionalTables::getPHPName($column->id)) === strtolower(AdditionalTables::getPHPName($oldColumn->id))) {
-                        $identicals[] = "'" . $column->id . "' - '" . $oldColumn->id . "'";
+                        if (strtolower(AdditionalTables::getPHPName($column->var_name)) === strtolower(AdditionalTables::getPHPName($oldColumn->var_name))) {
+                            $identicals[] = "'" . $column->id . "' - '" . $oldColumn->id . "'";
+                        }
                     }
                 }
             }

workflow/engine/src/ProcessMaker/BusinessModel/Variable.php

@@ -26,6 +26,16 @@ class Variable
         'object'  => 10
     ];
 
+    /**
+     * Get the variables types accepted
+     * 
+     * @return array 
+     */
+    public function getVariableTypes()
+    {
+        return $this->variableTypes;
+    }
+
     /**
      * Create Variable for a Process
      *
@@ -355,6 +365,33 @@ class Variable
         return $arrayVariables;
     }
 
+     /**
+     * Get data of Variables related to the specific type
+     *
+     * @param string $processUid Unique id of Process
+     * @param int $typeVarId
+     * @param int $start
+     * @param int $limit
+     * @param string $search
+     * @param string $prefix
+     *
+     * @return array, return an array with varaibles filter by type
+     */
+    public function getVariablesByType($processUid, $typeVarId = 0, $start = null, $limit = null, $search = null, $prefix = null)
+    {
+        //Verify data
+        $proId = Validator::proUid($processUid, '$prj_uid');
+        $variables = ProcessVariables::getVariablesByType($proId, $typeVarId, $start, $limit, $search);
+        $arrayVariables = [];
+        foreach ($variables as $var) {
+            $arrayVariables[] = [
+                'value' => is_null($prefix) ? $var['VAR_NAME'] : $prefix . $var['VAR_NAME'],
+            ];
+        }
+
+        return $arrayVariables;
+    }
+
     /**
      * Verify field definition
      *