Merge branch '4.1-develop' into 4.1.17

Author: velkymx

ProcessMaker/Http/Controllers/Api/ProcessRequestController.php

@@ -136,6 +136,10 @@ public function index(Request $request)
             }
         }
 
+        if (! $user->can('view-all_requests')) {
+            $query->pmql('requester = "' . $user->username . '" OR participant = "' . $user->username . '"');
+        }
+
         $query->nonSystem();
 
         try {
@@ -375,7 +379,7 @@ public function activateIntermediateEvent(ProcessRequest $request, $event)
     {
         // Get the process definition
         $process = $request->process;
-        $catchEvent = $process->getDefinitions()->findElementById($event)->getBpmnElementInstance();
+        $catchEvent = $request->getVersionDefinitions()->findElementById($event)->getBpmnElementInstance();
         if (!($catchEvent instanceof CatchEventInterface)) {
             return abort(423, __('Invalid element, not a catch event ' . get_class($catchEvent)));
         }

ProcessMaker/Managers/TaskSchedulerManager.php

@@ -259,9 +259,10 @@ public function executeIntermediateTimerEvent(ScheduledTask $task, $config)
         }
 
         $process = Process::find($id);
+        /** @var ProcessRequest $request */
         $request = ProcessRequest::find($task->process_request_id);
 
-        $definitions = $process->getDefinitions();
+        $definitions = $request->getVersionDefinitions();
         if (!$definitions->findElementById($config->element_id)) {
             return;
         }

ProcessMaker/Models/Process.php

@@ -490,7 +490,7 @@ public function getNextUser(ActivityInterface $activity, ProcessRequestToken $to
             return $userByRule;
         }
 
-        $definitions = $token->getInstance()->process->getDefinitions();
+        $definitions = $token->getInstance()->getVersionDefinitions();
         $properties = $definitions->findElementById($activity->getId())->getBpmnElementInstance()->getProperties();
         $assignmentLock = array_key_exists('assignmentLock', $properties) ? $properties['assignmentLock']  : false;
 

ProcessMaker/Models/ProcessRequest.php

@@ -22,7 +22,7 @@
 use Spatie\MediaLibrary\HasMedia\HasMedia;
 use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
 use Throwable;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
+use ProcessMaker\Repositories\BpmnDocument;
 use ProcessMaker\Traits\HideSystemResources;
 
 /**
@@ -42,6 +42,7 @@
  * @property \Carbon\Carbon $created_at
  * @property Process $process
  * @property ProcessRequestLock[] $locks
+ * @method static ProcessRequest find($id)
  *
  * @OA\Schema(
  *   schema="processRequestEditable",
@@ -774,4 +775,18 @@ public function hasLock(ProcessRequestLock $lock)
         $first = $this->locks()->orderBy('id')->first();
         return !$first || $first->getKey() === $lock->getKey();
     }
+
+    /**
+     * Get the BPMN definitions version of the process that is running.
+     *
+     * @param boolean $forceParse
+     * @param mixed $engine
+     *
+     * @return BpmnDocument
+     */
+    public function getVersionDefinitions($forceParse = false, $engine = null)
+    {
+        $processVersion = $this->processVersion ?: $this->process;
+        return $processVersion->getDefinitions($forceParse, $engine);
+    }
 }

ProcessMaker/Models/ProcessRequestToken.php

@@ -301,7 +301,9 @@ public function getDefinition($asObject = false, $par = null)
      */
     public function getBpmnDefinition()
     {
-        $definitions = $this->processRequest->process->getDefinitions();
+        /** @var ProcessRequest $request */
+        $request = $this->processRequest ?: $this->getInstance();
+        $definitions = $request->getVersionDefinitions();
         return $definitions->findElementById($this->element_id);
     }
 

database/migrations/2020_11_16_215424_create_security_logs_table.php

@@ -4,6 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 use ProcessMaker\Models\Permission;
+use ProcessMaker\Models\SecurityLog;
 
 class CreateSecurityLogsTable extends Migration
 {
@@ -14,15 +15,14 @@ class CreateSecurityLogsTable extends Migration
      */
     public function up()
     {
-        Schema::create('security_logs', function (Blueprint $table) {
+        $model = new SecurityLog;
+        Schema::connection($model->getConnectionName())->create('security_logs', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('event', 40)->index();
             $table->string('ip', 40)->index()->nullable();
             $table->json('meta')->nullable();
             $table->unsignedInteger('user_id')->nullable();
             $table->timestamp('occurred_at');
-            
-            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
         });
 
         if (! Permission::where('name', 'view-security-logs')->first()) {

package-lock.json

@@ -64,7 +64,7 @@
         "@processmaker/modeler": "^1.6.1",
         "@processmaker/processmaker-bpmn-moddle": "^0.11.0",
         "@processmaker/screen-builder": "^2.5.2",
-        "@processmaker/vue-form-elements": "^0.18.4",
+        "@processmaker/vue-form-elements": "^0.19.1",
         "babel-eslint": "^10.1.0",
         "babel-plugin-transform-object-rest-spread": "^6.26.0",
         "bootstrap": "^4.5.3",

package.json

@@ -23,6 +23,12 @@
     "calendarFormat": "dd/LL/yyyy",
     "title": "d/m/Y (31/12/2017)"
   },
+  {
+    "format": "d/m/Y h:i A",
+    "momentFormat": "DD/MM/YYYY h:mm A",
+    "calendarFormat": "dd/LL/yyyy h:mm a",
+    "title": "d/m/Y h:i A (31/12/2017 11:30 pm)"
+  },
   {
     "format": "d/m/Y H:i",
     "momentFormat": "DD/MM/YYYY HH:mm",

resources/js/data/datetime_formats.json

@@ -456,9 +456,11 @@ h1.page-title {
   padding: 0 10px;
 }
 
-// Data table rules
-
+.b-tooltip:not([style*='transform']) { 
+  top: 0; 
+}
 
+// Data table rules
 
 [class^='icon-'],
 [class*=' icon-'] {