fix: #0008961: Reports are not available for users with specific role and default role set to 'no rights' (TestLinkOpenSourceTRMS#283)

atisne · web-flow · commit bcc840714886 · 2020-10-17T11:22:37.000+02:00
diff --git a/lib/results/baselinel1l2.php b/lib/results/baselinel1l2.php
@@ -592,6 +592,6 @@ function checkRights(&$db,&$user,$context = null) {
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
diff --git a/lib/results/charts.php b/lib/results/charts.php
@@ -153,6 +153,6 @@ function checkRights(&$db,&$user,$context = null)
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
diff --git a/lib/results/execTimelineStats.php b/lib/results/execTimelineStats.php
@@ -343,6 +343,6 @@ function checkRights(&$db,&$user,$context = null) {
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
diff --git a/lib/results/neverRunByPP.php b/lib/results/neverRunByPP.php
@@ -294,7 +294,7 @@ function checkRights(&$db,&$user,$context = null) {
     $context->tproject_id = $context->tplan_id = null;
     $context->getAccessAttr = false; 
   }
-  $check = $user->hasRight($db,'testplan_metrics',
+  $check = $user->hasRightOnProj($db,'testplan_metrics',
     $context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
diff --git a/lib/results/printDocument.php b/lib/results/printDocument.php
@@ -738,6 +738,6 @@ function checkRights(&$db,&$user,$context = null)
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
diff --git a/lib/results/resultsByStatus.php b/lib/results/resultsByStatus.php
@@ -480,7 +480,7 @@ function checkRights(&$db,&$user,$context = null)
     $context->tproject_id = $context->tplan_id = null;
     $context->getAccessAttr = false; 
   }
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
 
diff --git a/lib/results/resultsByTSuite.php b/lib/results/resultsByTSuite.php
@@ -571,6 +571,6 @@ function checkRights(&$db,&$user,$context = null) {
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
diff --git a/lib/results/resultsByTesterPerBuild.php b/lib/results/resultsByTesterPerBuild.php
@@ -320,7 +320,7 @@ function checkRights(&$db,&$user,$context = null)
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
 
diff --git a/lib/results/resultsGeneral.php b/lib/results/resultsGeneral.php
@@ -646,6 +646,6 @@ function checkRights(&$db,&$user,$context = null) {
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
diff --git a/lib/results/resultsTC.php b/lib/results/resultsTC.php
@@ -121,7 +121,7 @@ function checkRights(&$db,&$user,$context = null)
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
 
diff --git a/lib/results/resultsTCAbsoluteLatest.php b/lib/results/resultsTCAbsoluteLatest.php
@@ -149,7 +149,7 @@ function checkRights(&$db,&$user,$context = null)
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
 
diff --git a/lib/results/resultsTCFlat.php b/lib/results/resultsTCFlat.php
@@ -179,7 +179,7 @@ function checkRights(&$db,&$user,$context = null)
     $context->getAccessAttr = false; 
   }
 
-  $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
+  $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);
   return $check;
 }
 
diff --git a/lib/results/testPlanWithCF.php b/lib/results/testPlanWithCF.php
@@ -204,4 +204,4 @@ function init_args(&$tplan_mgr)
 function checkRights(&$db,&$user)
 {
 	return $user->hasRightOnProj($db,'testplan_metrics');
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,6 @@ function checkRights(&$db,&$user,$context = null) {`
`592`	`592`	`$context->getAccessAttr = false;`
`593`	`593`	`}`
`594`	`594`
`595`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`595`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`596`	`596`	`return $check;`
`597`	`597`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,6 @@ function checkRights(&$db,&$user,$context = null)`
`153`	`153`	`$context->getAccessAttr = false;`
`154`	`154`	`}`
`155`	`155`
`156`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`156`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`157`	`157`	`return $check;`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,6 @@ function checkRights(&$db,&$user,$context = null) {`
`343`	`343`	`$context->getAccessAttr = false;`
`344`	`344`	`}`
`345`	`345`
`346`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`346`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`347`	`347`	`return $check;`
`348`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ function checkRights(&$db,&$user,$context = null) {`
`294`	`294`	`$context->tproject_id = $context->tplan_id = null;`
`295`	`295`	`$context->getAccessAttr = false;`
`296`	`296`	`}`
`297`		`- $check = $user->hasRight($db,'testplan_metrics',`
	`297`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',`
`298`	`298`	`$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`299`	`299`	`return $check;`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -738,6 +738,6 @@ function checkRights(&$db,&$user,$context = null)`
`738`	`738`	`$context->getAccessAttr = false;`
`739`	`739`	`}`
`740`	`740`
`741`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`741`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`742`	`742`	`return $check;`
`743`	`743`	`}`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ function checkRights(&$db,&$user,$context = null)`
`480`	`480`	`$context->tproject_id = $context->tplan_id = null;`
`481`	`481`	`$context->getAccessAttr = false;`
`482`	`482`	`}`
`483`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`483`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`484`	`484`	`return $check;`
`485`	`485`	`}`
`486`	`486`
Original file line number	Diff line number	Diff line change
`@@ -571,6 +571,6 @@ function checkRights(&$db,&$user,$context = null) {`
`571`	`571`	`$context->getAccessAttr = false;`
`572`	`572`	`}`
`573`	`573`
`574`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`574`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`575`	`575`	`return $check;`
`576`	`576`	`}`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ function checkRights(&$db,&$user,$context = null)`
`320`	`320`	`$context->getAccessAttr = false;`
`321`	`321`	`}`
`322`	`322`
`323`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`323`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`324`	`324`	`return $check;`
`325`	`325`	`}`
`326`	`326`
Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,6 @@ function checkRights(&$db,&$user,$context = null) {`
`646`	`646`	`$context->getAccessAttr = false;`
`647`	`647`	`}`
`648`	`648`
`649`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`649`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`650`	`650`	`return $check;`
`651`	`651`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ function checkRights(&$db,&$user,$context = null)`
`121`	`121`	`$context->getAccessAttr = false;`
`122`	`122`	`}`
`123`	`123`
`124`		`- $check = $user->hasRight($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
	`124`	`+ $check = $user->hasRightOnProj($db,'testplan_metrics',$context->tproject_id,$context->tplan_id,$context->getAccessAttr);`
`125`	`125`	`return $check;`
`126`	`126`	`}`
`127`	`127`