From d117275c5baf8d160e52cd3eec54b87eca5f6e15 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 27 Aug 2020 13:01:57 +0800 Subject: [PATCH 1/7] * Fix group programs. --- module/group/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/group/control.php b/module/group/control.php index e01984ec82..dffa91c984 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -285,7 +285,7 @@ class group extends control $this->view->position = $position; $this->view->allUsers = $allUsers; $this->view->group = $group; - $this->view->programs = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('program')->eq(0)->andWhere('deleted')->eq(0)->fetchPairs(); + $this->view->programs = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('program')->eq(0)->andWhere('deleted')->eq(0)->andWhere('isCat')->eq(0)->fetchPairs(); $this->view->deptTree = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createManagePgmAdminLink'), $groupID); $this->view->groupUsers = $groupUsers; $this->view->userPrograms = $userPrograms; From 840b7ab03afc9521bb24ad11427ff2df015d021d Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 27 Aug 2020 13:19:45 +0800 Subject: [PATCH 2/7] * Add risk commit. --- module/risk/control.php | 10 ++++++++++ module/risk/model.php | 12 ++++++++++++ module/risk/view/activate.html.php | 12 ++++++++++++ module/risk/view/assignto.html.php | 12 ++++++++++++ module/risk/view/batchcreate.html.php | 12 ++++++++++++ module/risk/view/browse.html.php | 12 ++++++++++++ module/risk/view/cancel.html.php | 12 ++++++++++++ module/risk/view/close.html.php | 12 ++++++++++++ module/risk/view/create.html.php | 12 ++++++++++++ module/risk/view/edit.html.php | 12 ++++++++++++ module/risk/view/hangup.html.php | 12 ++++++++++++ module/risk/view/track.html.php | 12 ++++++++++++ module/risk/view/view.html.php | 12 ++++++++++++ 13 files changed, 154 insertions(+) diff --git a/module/risk/control.php b/module/risk/control.php index bdfeb64926..f6bd8ab0db 100644 --- a/module/risk/control.php +++ b/module/risk/control.php @@ -1,4 +1,14 @@ + * @package risk + * @version $Id: control.php 5107 2013-07-12 01:46:12Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ class risk extends control { /** diff --git a/module/risk/model.php b/module/risk/model.php index 768838d0ca..a154ec9f61 100644 --- a/module/risk/model.php +++ b/module/risk/model.php @@ -1,4 +1,16 @@ + * @package risk + * @version $Id: model.php 5079 2013-07-10 00:44:34Z chencongzhi520@gmail.com $ + * @link http://www.zentao.net + */ +?> + + * @package risk + * @version $Id: activate.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +?>
diff --git a/module/risk/view/assignto.html.php b/module/risk/view/assignto.html.php index 039d43d092..5e6263de6c 100644 --- a/module/risk/view/assignto.html.php +++ b/module/risk/view/assignto.html.php @@ -1,3 +1,15 @@ + + * @package risk + * @version $Id: assignto.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +?>
diff --git a/module/risk/view/batchcreate.html.php b/module/risk/view/batchcreate.html.php index 22a2e0af8e..4ea69f2ad4 100644 --- a/module/risk/view/batchcreate.html.php +++ b/module/risk/view/batchcreate.html.php @@ -1,3 +1,15 @@ + + * @package risk + * @version $Id: batchcreate.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +?>
diff --git a/module/risk/view/browse.html.php b/module/risk/view/browse.html.php index d00552f263..45cb834d06 100644 --- a/module/risk/view/browse.html.php +++ b/module/risk/view/browse.html.php @@ -1,3 +1,15 @@ + + * @package risk + * @version $Id: browse.html.php 4903 2013-06-26 05:32:59Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +?> - global->flow);
- global->flow != 'onlyTest');?> + bug->project : $lang->bug->type;?> @@ -111,7 +111,7 @@ js::set('flow', $config->global->flow); - config->global->flow != 'onlyTest' && $showProject):?> + @@ -228,7 +228,7 @@ js::set('flow', $config->global->flow); $showStory = strpos(",$showFields,", ',story,') !== false; $showTask = strpos(",$showFields,", ',task,') !== false; ?> - config->global->flow != 'onlyTest'):?> + bug->story : $lang->bug->task;?> diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index bb75c7bc77..899a902c57 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -112,14 +112,12 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
- global->flow != 'onlyTest'):?> bug->productplan;?> plan, "class='form-control chosen'");?> - bug->type;?> bug->typeList, $bug->type, "class='form-control chosen'"); ?> @@ -172,7 +170,6 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
- global->flow != 'onlyTest'):?>
bug->legendPrjStoryTask;?>
@@ -193,7 +190,6 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
-
bug->legendLife;?>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index fcb5107c15..e9adcdad75 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -77,7 +77,7 @@ common::printIcon('bug', 'close', $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true); common::printIcon('bug', 'activate', $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true); - if($config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', '', $lang->bug->toStory); + common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', '', $lang->bug->toStory); common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap'); echo $this->buildOperateMenu($bug, 'view'); @@ -96,9 +96,7 @@
@@ -229,7 +227,6 @@
- global->flow != 'onlyTest'):?>
@@ -258,7 +255,6 @@
-
@@ -356,7 +352,6 @@ - global->flow != 'onlyTest'):?> toStory != 0):?> bug->toStory;?> @@ -369,7 +364,6 @@ createLink('task', 'view', "taskID=$bug->toTask", '', true), "#$bug->toTask $bug->toTaskTitle", '', "class='iframe' data-width='80%'");?> - diff --git a/module/build/control.php b/module/build/control.php index 145530771b..a682cd3324 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -39,45 +39,27 @@ class build extends control $this->loadModel('project'); $this->loadModel('user'); - if($this->config->global->flow == 'onlyTest') - { - $product = $this->loadModel('product')->getByID($projectID); - $products = $this->product->getPairs(); - $this->product->setMenu($products, $projectID); - $this->lang->build->menu = $this->lang->product->menu; + /* Set menu. */ + $this->project->setMenu($this->project->getPairs(), $projectID); - $productGroups = array(); - $product->branch = 0; - foreach($products as $productID => $name) $productGroups[$productID]['branch'] = 0; + /* Get stories and bugs. */ + $orderBy = 'status_asc, stage_asc, id_desc'; - $this->view->title = $this->lang->build->create; - $this->view->product = $product; - $this->view->branches = ($product and $product->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($projectID); - } - else - { - /* Set menu. */ - $this->project->setMenu($this->project->getPairs(), $projectID); + /* Assign. */ + $project = $this->loadModel('project')->getById($projectID); - /* Get stories and bugs. */ - $orderBy = 'status_asc, stage_asc, id_desc'; + $productGroups = $this->project->getProducts($projectID); + $productID = $productID ? $productID : key($productGroups); + $products = array(); + foreach($productGroups as $product) $products[$product->id] = $product->name; - /* Assign. */ - $project = $this->loadModel('project')->getById($projectID); - - $productGroups = $this->project->getProducts($projectID); - $productID = $productID ? $productID : key($productGroups); - $products = array(); - foreach($productGroups as $product) $products[$product->id] = $product->name; - - $this->view->title = $project->name . $this->lang->colon . $this->lang->build->create; - $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$projectID"), $project->name); - $this->view->position[] = $this->lang->build->create; - $this->view->product = isset($productGroups[$productID]) ? $productGroups[$productID] : ''; - $this->view->branches = (isset($productGroups[$productID]) and $productGroups[$productID]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($productID); - $this->view->projectID = $projectID; - $this->view->orderBy = $orderBy; - } + $this->view->title = $project->name . $this->lang->colon . $this->lang->build->create; + $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$projectID"), $project->name); + $this->view->position[] = $this->lang->build->create; + $this->view->product = isset($productGroups[$productID]) ? $productGroups[$productID] : ''; + $this->view->branches = (isset($productGroups[$productID]) and $productGroups[$productID]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($productID); + $this->view->projectID = $projectID; + $this->view->orderBy = $orderBy; $this->view->products = $products; $this->view->lastBuild = $this->build->getLast($projectID); @@ -116,65 +98,46 @@ class build extends control $build = $this->build->getById((int)$buildID); - if($this->config->global->flow == 'onlyTest') + $this->loadModel('project'); + + /* Set menu. */ + $this->project->setMenu($this->project->getPairs(), $build->project); + + /* Get stories and bugs. */ + $orderBy = 'status_asc, stage_asc, id_desc'; + + /* Assign. */ + $project = $this->loadModel('project')->getById($build->project); + if(empty($project)) { - $product = $this->loadModel('product')->getById($build->product); - $products = $this->product->getPairs(); - $this->product->setMenu($products, $build->product); - $this->lang->build->menu = $this->lang->product->menu; - - $productGroups = array(); - $product->branch = 0; - foreach($products as $productID => $name) $productGroups[$productID]['branch'] = 0; - - $this->view->title = $this->lang->build->edit; - $this->view->position[] = $this->lang->build->edit; - $this->view->product = $product; - $this->view->branches = ($product and $product->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($build->product); + $project = new stdclass(); + $project->name = ''; } - else + + $projects = $this->loadModel('product')->getProjectPairs($build->product, $build->branch, 'nodeleted'); + if(!isset($projects[$build->project])) $projects[$build->project] = $project->name; + + $productGroups = $this->project->getProducts($build->project); + + $this->loadModel('product'); + if(!isset($productGroups[$build->product])) { - $this->loadModel('project'); - - /* Set menu. */ - $this->project->setMenu($this->project->getPairs(), $build->project); - - /* Get stories and bugs. */ - $orderBy = 'status_asc, stage_asc, id_desc'; - - /* Assign. */ - $project = $this->loadModel('project')->getById($build->project); - if(empty($project)) - { - $project = new stdclass(); - $project->name = ''; - } - - $projects = $this->loadModel('product')->getProjectPairs($build->product, $build->branch, 'nodeleted'); - if(!isset($projects[$build->project])) $projects[$build->project] = $project->name; - - $productGroups = $this->project->getProducts($build->project); - - $this->loadModel('product'); - if(!isset($productGroups[$build->product])) - { - $product = $this->product->getById($build->product); - $product->branch = $build->branch; - $productGroups[$build->product] = $product; - } - - $products = array(); - foreach($productGroups as $product) $products[$product->id] = $product->name; - - $this->view->title = $project->name . $this->lang->colon . $this->lang->build->edit; - $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$build->project"), $project->name); - $this->view->position[] = $this->lang->build->edit; - $this->view->product = isset($productGroups[$build->product]) ? $productGroups[$build->product] : ''; - $this->view->branches = (isset($productGroups[$build->product]) and $productGroups[$build->product]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($build->product); - $this->view->projects = $projects; - $this->view->orderBy = $orderBy; + $product = $this->product->getById($build->product); + $product->branch = $build->branch; + $productGroups[$build->product] = $product; } + $products = array(); + foreach($productGroups as $product) $products[$product->id] = $product->name; + + $this->view->title = $project->name . $this->lang->colon . $this->lang->build->edit; + $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$build->project"), $project->name); + $this->view->position[] = $this->lang->build->edit; + $this->view->product = isset($productGroups[$build->product]) ? $productGroups[$build->product] : ''; + $this->view->branches = (isset($productGroups[$build->product]) and $productGroups[$build->product]->type == 'normal') ? array() : $this->loadModel('branch')->getPairs($build->product); + $this->view->projects = $projects; + $this->view->orderBy = $orderBy; + $this->view->productGroups = $productGroups; $this->view->products = $products; $this->view->users = $this->loadModel('user')->getPairs('noletter', $build->builder); @@ -221,39 +184,26 @@ class build extends control ->page($bugPager) ->fetchAll(); - if($this->config->global->flow == 'onlyTest') - { - $products = $this->loadModel('product')->getPairs(); - $this->product->setMenu($products, $build->product, $buildID); - $this->lang->build->menu = $this->lang->product->menu; + $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1); + $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($build->stories)->andWhere('deleted')->eq(0) + ->beginIF($type == 'story')->orderBy($orderBy)->fi() + ->page($storyPager) + ->fetchAll('id'); + $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($build->stories)->andWhere('branch')->eq($build->branch)->fetchPairs('story', 'stage'); + foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage; - $this->view->title = "BUILD #$build->id $build->name - " . $build->productName; - $this->view->position[] = html::a($this->createLink('product', 'build', "productID=$build->product"), $build->productName); - $this->view->position[] = $this->lang->build->view; - } - else - { - $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1); - $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($build->stories)->andWhere('deleted')->eq(0) - ->beginIF($type == 'story')->orderBy($orderBy)->fi() - ->page($storyPager) - ->fetchAll('id'); - $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($build->stories)->andWhere('branch')->eq($build->branch)->fetchPairs('story', 'stage'); - foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage; + $this->loadModel('project')->setMenu($this->project->getPairs(), $build->project, $buildID); + $projects = $this->project->getPairs('empty'); - $this->loadModel('project')->setMenu($this->project->getPairs(), $build->project, $buildID); - $projects = $this->project->getPairs('empty'); + $this->view->title = "BUILD #$build->id $build->name - " . $projects[$build->project]; + $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$build->project"), $projects[$build->project]); + $this->view->position[] = $this->lang->build->view; + $this->view->stories = $stories; + $this->view->storyPager = $storyPager; - $this->view->title = "BUILD #$build->id $build->name - " . $projects[$build->project]; - $this->view->position[] = html::a($this->createLink('project', 'task', "projectID=$build->project"), $projects[$build->project]); - $this->view->position[] = $this->lang->build->view; - $this->view->stories = $stories; - $this->view->storyPager = $storyPager; - - $generatedBugPager = new pager($type == 'generatedBug' ? $recTotal : 0, $recPerPage, $type == 'generatedBug' ? $pageID : 1); - $this->view->generatedBugs = $this->bug->getProjectBugs($build->project, $build->id, '', 0, $type == 'generatedBug' ? $orderBy : 'status_desc,id_desc', '', $generatedBugPager); - $this->view->generatedBugPager = $generatedBugPager; - } + $generatedBugPager = new pager($type == 'generatedBug' ? $recTotal : 0, $recPerPage, $type == 'generatedBug' ? $pageID : 1); + $this->view->generatedBugs = $this->bug->getProjectBugs($build->project, $build->id, '', 0, $type == 'generatedBug' ? $orderBy : 'status_desc,id_desc', '', $generatedBugPager); + $this->view->generatedBugPager = $generatedBugPager; $this->executeHooks($buildID); @@ -309,7 +259,6 @@ class build extends control $this->send($response); } - if($this->config->global->flow == 'onlyTest') die(js::locate($this->createLink('project', 'build', "productID=$build->product"), 'parent')); die(js::locate($this->createLink('project', 'build', "projectID=$build->project"), 'parent')); } } diff --git a/module/build/js/view.js b/module/build/js/view.js index ef33582dd2..9112ee4883 100644 --- a/module/build/js/view.js +++ b/module/build/js/view.js @@ -44,30 +44,27 @@ function loadURL(url, type) $(function() { - if(flow != 'onlyTest') + if(link == 'true') showLink(buildID, type, param); + var infoShowed = false; + $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e) { - if(link == 'true') showLink(buildID, type, param); - var infoShowed = false; - $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e) + var href = $(e.target).attr('href'); + var tabPane = $(href + '.tab-pane'); + if(tabPane.size() == 0) return; + var formID = tabPane.find('.linkBox').find('form:last'); + if(formID.size() == 0) formID = tabPane.find('form:last'); + + if(href == '#buildInfo' && !infoShowed) { - var href = $(e.target).attr('href'); - var tabPane = $(href + '.tab-pane'); - if(tabPane.size() == 0) return; - var formID = tabPane.find('.linkBox').find('form:last'); - if(formID.size() == 0) formID = tabPane.find('form:last'); - - if(href == '#buildInfo' && !infoShowed) + var $tr = $('#buildInfo .detail-content .table-data tbody tr:first'); + width = $tr.width() - $tr.find('th').width(); + $('#buildInfo img').each(function() { - var $tr = $('#buildInfo .detail-content .table-data tbody tr:first'); - width = $tr.width() - $tr.find('th').width(); - $('#buildInfo img').each(function() - { - if($(this).parent().prop('tagName').toLowerCase() == 'a') $(this).unwrap(); - setImageSize($(this), width, 0); - }); + if($(this).parent().prop('tagName').toLowerCase() == 'a') $(this).unwrap(); + setImageSize($(this), width, 0); + }); - infoShowed = true; - } - }); - } + infoShowed = true; + } + }); }) diff --git a/module/build/model.php b/module/build/model.php index bdd36a63f0..b1e67893be 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -208,8 +208,6 @@ class buildModel extends model ->remove('resolvedBy,allchecker,files,labels,uid') ->get(); - if($this->config->global->flow == 'onlyTest') $build->project = 0; - $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid); $this->dao->insert(TABLE_BUILD)->data($build) ->autoCheck() @@ -244,7 +242,6 @@ class buildModel extends model ->remove('allchecker,resolvedBy,files,labels,uid') ->get(); - if($this->config->global->flow == 'onlyTest') $this->config->build->edit->requiredFields = str_replace('project,', '', $this->config->build->edit->requiredFields); $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->edit['id'], $this->post->uid); $this->dao->update(TABLE_BUILD)->data($build) ->autoCheck() diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index 78386ca79a..c96c4dd320 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -43,12 +43,10 @@ build->notice->changeProduct;?> - config->global->flow != 'onlyTest'):?> build->project;?> project, "class='form-control chosen' required");?> - build->name;?> name, "class='form-control' required");?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index da89fa4ad9..ab98595e97 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -59,28 +59,6 @@ tbody tr td:first-child input{display:none;}
- global->flow == 'onlyTest'):?> -
-
build->desc;?>
-
desc;?>
-
- fetch('file', 'printFiles', array('files' => $build->files, 'fieldset' => 'true'));?> - -
- -
- deleted) - { - echo "
"; - common::printIcon('build', 'edit', "buildID=$build->id", $build); - common::printIcon('build', 'delete', "buildID=$build->id", $build, 'button', '', 'hiddenwin'); - } - ?> -
-
-
    @@ -360,7 +338,6 @@ tbody tr td:first-child input{display:none;} filePath, $build->filePath, '_blank');?> printExtendFields($build, 'table', 'inForm=0');?> - global->flow != 'onlyTest'):?> build->desc;?> @@ -371,24 +348,18 @@ tbody tr td:first-child input{display:none;} -
- global->flow != 'onlyTest'):?> fetch('file', 'printFiles', array('files' => $build->files, 'fieldset' => 'true'));?> - - -global->flow != 'onlyTest'):?> id)?> - diff --git a/module/caselib/model.php b/module/caselib/model.php index e426b514d9..b73209dab3 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -41,24 +41,6 @@ class caselibModel extends model } } - if($this->config->global->flow == 'onlyTest') - { - $modules = $this->loadModel('tree')->getModulePairs($libID, 'caselib'); - $moduleName = ($moduleID && isset($modules[$moduleID])) ? $modules[$moduleID] : $this->lang->tree->all; - - if(!$isMobile) - { - $dropMenuLink = helper::createLink('tree', 'ajaxGetDropMenu', "objectID=$libID&module=caselib&method=browse"); - $selectHtml .= "
"; - } - else - { - $selectHtml .= "{$moduleName} "; - } - } - setCookie("lastCaseLib", $libID, $this->config->cookieLife, $this->config->webRoot, '', false, true); $pageNav = ''; diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index 085d032cd5..64c11db67c 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -19,7 +19,6 @@ js::set('confirmDelete', $lang->testcase->confirmDelete); js::set('batchDelete', $lang->testcase->confirmBatchDelete); js::set('flow', $config->global->flow); ?> -global->flow != 'onlyTest'):?>