fix: crash when trying to add req link to a test case that has latest…

… version INACTIVE
TestLinkOpenSourceTRMS · May 9, 2020 · b798b66 · b798b66
1 parent eff2809
commit b798b66
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/gui/templates/tl-classic/testcases/tcView_viewer.tpl b/gui/templates/tl-classic/testcases/tcView_viewer.tpl
@@ -527,13 +527,16 @@ viewer for test case in test specification
 {if $gui->requirementsEnabled == TRUE && 
   ($gui->view_req_rights == "yes" || $gui->req_tcase_link_management) }
   {$reqLinkingEnabled = 0}
-  {if $gui->req_tcase_link_management && $args_frozen_version=="no" &&
-         $edit_enabled == 1 }
+  {if $gui->req_tcase_link_management 
+      && $args_frozen_version == "no"
+      && $args_testcase.active == 1 
+      && $edit_enabled == 1 }
          {$reqLinkingEnabled = 1}
   {/if}    
 
-  {if $tlCfg->testcase_cfg->reqLinkingDisabledAfterExec == 1 && 
-       $has_been_executed == 1 && $args_tcase_cfg->can_edit_executed == 0}
+  {if $tlCfg->testcase_cfg->reqLinkingDisabledAfterExec == 1 
+      && $has_been_executed == 1 
+      && $args_tcase_cfg->can_edit_executed == 0}
        {$reqLinkingEnabled = 0}
   {/if}
   <div {$addInfoDivStyle}>

diff --git a/lib/functions/requirement_mgr.class.php b/lib/functions/requirement_mgr.class.php
@@ -1104,8 +1104,16 @@ function assign_to_tcase($req_id,$testcase_id,$author_id) {
 
     $output = 0;
     $now = $this->db->db_now();
-    if($testcase_id && $req_id) {
+    if ($testcase_id && $req_id) {
+      // Get Latest Active Test Case Version 
+      $tcv = current($tcMgr->get_last_active_version($testcase_id));
+      if ($tcv == null) {
+        return $output;
+      }
+    }
 
+    // Go ahead
+    if ($testcase_id && $req_id) {
       // Need to get latest version for each requirement
       $reqIDSet = (array)$req_id;
       $gopt = array('output' => 'id,version');
@@ -1118,8 +1126,6 @@ function assign_to_tcase($req_id,$testcase_id,$author_id) {
         $reqLatestVersionNumberSet[] = $isofix['version'];
       }
 
-      // Get Latest Active Test Case Version 
-      $tcv = current($tcMgr->get_last_active_version($testcase_id));
       $ltcv = $tcv['tcversion_id'];
       $ltcvNum = $tcv['version'];
       $in_clause = implode(",",$reqLatestVersionIDSet);
@@ -1161,9 +1167,7 @@ function assign_to_tcase($req_id,$testcase_id,$author_id) {
                             "ASSIGN",$this->object_table);
             }                 
           }
-        }    
-        else
-        {
+        } else {
           $output = 1;
         }
       }