Fix #66 required field scopes now correctly work

creecros · Feb 16, 2021 · 1dc83bc · 1dc83bc
1 parent 43f3a86
commit 1dc83bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Model/MetadataTypeModel.php b/Model/MetadataTypeModel.php
@@ -93,9 +93,13 @@ public function getScope($id)
             ->findAllByColumn('attached_to');
     }  
 
-    public function getReqs()
+    public function getReqs($scope)
     {
         return $this->db->table(self::TABLE)
+            ->beginOr()
+            ->eq('attached_to', 0)
+            ->eq('attached_to', $scope)
+            ->closeOr()
             ->eq('is_required', true)
             ->findAllByColumn('human_name');
     }  

diff --git a/Plugin.php b/Plugin.php
@@ -133,7 +133,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.4.11';
+        return '1.4.12';
     }
 
     public function getPluginHomepage()

diff --git a/Validator/NewTaskValidator.php b/Validator/NewTaskValidator.php
@@ -80,7 +80,7 @@ public function validateCreation(array $values)
             new Validators\Required('title', t('The title is required')),
         );
 
-        $metaReqs = $this->metadataTypeModel->getReqs();
+        $metaReqs = $this->metadataTypeModel->getReqs($values['project_id']);
 
         foreach ($metaReqs as $req) {
             $rules = array_merge($rules, array(