diff --git a/module/custom/control.php b/module/custom/control.php index 868ce55d17..47ddcd422c 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -421,6 +421,7 @@ class custom extends control $this->custom->disableFeaturesByMode($mode); if($mode == 'light') $this->custom->processProjectAcl(); + if($mode == 'ALM') $this->loadModel('setting')->setItem('system.common.closedFeatures', 'otherOA'); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); return $this->sendSuccess(array('callback' => '$.apps.updateAppsMenu(true);', 'load' => true, 'closeModel' => true)); diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php index 15c332524d..b49dce0778 100644 --- a/module/product/ui/browse.html.php +++ b/module/product/ui/browse.html.php @@ -251,7 +251,7 @@ $fnGenerateFootToolbar = function() use ($lang, $product, $productID, $project, $canBatchChangeStage = $canBeChanged && hasPriv('story', 'batchChangeStage') && $storyType == 'story'; $canBatchChangeBranch = $canBeChanged && hasPriv($storyType, 'batchChangeBranch') && $product && $product->type != 'normal' && $productID; $canBatchChangeModule = $canBeChanged && hasPriv($storyType, 'batchChangeModule') && $productID && (($product->type != 'normal' && $branchID != 'all') || $product->type == 'normal') && !$isProjectStory; - $canBatchChangeParent = $canBeChanged && hasPriv($storyType, 'batchChangeParent') && !($storyType == 'epic' && count($gradeGroup['epic']) < 2); + $canBatchChangeParent = $canBeChanged && hasPriv($storyType, 'batchChangeParent') && !($storyType == 'epic' && count($gradeGroup['epic']) < 2) && $app->tab == 'product'; $canBatchUnlink = $canBeChanged && $projectHasProduct && hasPriv('projectstory', 'batchUnlinkStory'); $canBatchImportToLib = $canBeChanged && $isProjectStory && in_array($this->config->edition, array('max', 'ipd')) && hasPriv('story', 'batchImportToLib') && helper::hasFeature('storylib'); $canBatchChangeRoadmap = $canBeChanged && hasPriv('story', 'batchChangeRoadmap') && $config->vision == 'or' && $storyType == 'requirement'; diff --git a/module/testcase/control.php b/module/testcase/control.php index 13683324f9..f66f7c0834 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -585,7 +585,7 @@ class testcase extends control $showSuhosinInfo = common::judgeSuhosinSetting($countInputVars); if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars); - $stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch); + $stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch, array(), 'all', 'id_desc', 0, '', 'story', false); $caseStories = $this->story->getByList(array_column($cases, 'story')); $caseStories = $this->story->formatStories($caseStories, 'story'); @@ -1262,7 +1262,7 @@ class testcase extends control $this->testcaseZen->assignShowImportVars($productID, $branch, $data['caseData'], isset($stepVars) ? $stepVars : 0, $pagerID, $maxImport); $this->view->title = $this->lang->testcase->common . $this->lang->hyphen . $this->lang->testcase->showImport; - $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch); + $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch, array(), 'all', 'id_desc', 0, '', 'story', false); $this->view->cases = $this->testcase->getByProduct($productID); $this->view->stepData = array_values($data['stepData']); $this->view->productID = $productID; diff --git a/module/testcase/zen.php b/module/testcase/zen.php index ecb96431ff..865cb5dce4 100755 --- a/module/testcase/zen.php +++ b/module/testcase/zen.php @@ -920,7 +920,7 @@ class testcaseZen extends testcase } else { - $stories = $this->loadModel('story')->getProductStoryPairs($case->product, $case->branch, $moduleIdList, $storyStatus,'id_desc', 0, '', 'story', false); + $stories = $this->loadModel('story')->getProductStoryPairs($case->product, $case->branch, $moduleIdList, $storyStatus, 'id_desc', 0, '', 'story', false); } if(!isset($stories[$case->story])) {