Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch dev/bug-68659 of zentao/zentaopms (#13044)

Browse Source
This commit is contained in:
刘刚
2025-12-29 13:15:13 +08:00
committed by Gitfox
parent bac0c19354 a23d3ac7e4
commit 72fa50bf29
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/router.class.php
+2 -2
View File
@@ -3926,8 +3926,8 @@ class ztSessionHandler implements SessionHandlerInterface
public function gc($maxlifeTime): int|false
{
/* API session never expires. */
if(!isset($this->config->sessionVar)) return 0;
if((defined('RUN_MODE') && RUN_MODE == 'api') || isset($_GET[$this->config->sessionVar])) return 0;
global $config;
if((defined('RUN_MODE') && RUN_MODE == 'api') || isset($_GET[$config->sessionVar])) return 0;
$time = time();
$count = 0;
module/story/model.php
+3
View File
@@ -3892,6 +3892,9 @@ class storyModel extends model
if($action == 'submitreview' && strpos('draft,changing', $story->status) === false) return false;
if($action == 'createtestcase' || $action == 'batchcreatetestcase') return $config->vision != 'lite' && $story->isParent == '0' && $story->type == 'story';
/* Check isClickable when feedback convert to story. */
if($action == 'create' && $app->rawModule == 'feedback') return ($config->global->flow == 'full' && strpos('closed|clarify|noreview', $story->status) === false);
if($action == 'createtask')
{
if($app->tab == 'project' && !empty($_SESSION['project']))
module/story/test/model/isclickable.php
+2 -1
View File
@@ -20,6 +20,7 @@ include dirname(__FILE__, 5) . '/test/lib/init.php';
su('admin');
zenData('story')->gen(5);
zenData('case')->gen(0);
global $tester;
$storyModel = $tester->loadModel('story');
@@ -31,4 +32,4 @@ r($storyModel::isClickable($story, 'close')) && p() && e('1'); // 判断
r($storyModel::isClickable($story, 'activate')) && p() && e('0'); // 判断需求2是否有激活按钮操作权限
r($storyModel::isClickable($story, 'assignto')) && p() && e('1'); // 判断需求2是否有指派按钮操作权限
r($storyModel::isClickable($story, 'createcase')) && p() && e('1'); // 判断需求2是否有创建用例按钮操作权限
r($storyModel::isClickable($story, 'batchcreate')) && p() && e('0'); // 判断需求2是否有批量创建按钮操作权限
r($storyModel::isClickable($story, 'batchcreate')) && p() && e('1'); // 判断需求2是否有批量创建按钮操作权限