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

* [task#132856] adjust system list.

Browse Source
This commit is contained in:
liyang
2024-11-22 15:37:41 +08:00
committed by 曹延义
parent 69b0824530
commit cfc823f9ce
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menu.php
+1 -1
View File
@@ -237,7 +237,7 @@ $lang->scrum->menu->doc = array('link' => "{$lang->doc->common}|doc|proj
$lang->scrum->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport', 'exclude' => 'execution-create,execution-batchedit');
if(helper::hasFeature('devops')) $lang->scrum->menu->devops = array('link' => "{$lang->devops->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo,mr');
$lang->scrum->menu->build = array('link' => "{$lang->build->common}|projectbuild|browse|project=%s", 'subModule' => 'projectbuild');
$lang->scrum->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease');
$lang->scrum->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease,system');
$lang->scrum->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s");
$lang->scrum->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'tree,stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team', 'exclude' => 'tree-browsetask');
module/projectrelease/ui/browse.html.php
+12
View File
@@ -16,8 +16,20 @@ featureBar
set::linkParams("projectID={$projectID}&executionID={$executionID}&type={key}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")
);
$canManageSystem = hasPriv('system', 'browse') && common::canModify('project', $project);
toolbar
(
!$project->hasProduct && $canManageSystem ? item(set
(
array
(
'class' => 'ghost',
'text' => $lang->release->manageSystem,
'url' => $this->createLink('system', 'browse', "productID=0&projectID={$projectID}"),
'data-app' => 'project'
)
)) : null,
common::canModify('project', $project) && hasPriv('projectrelease', 'create') ? item(set
([
'text' => $lang->release->create,
module/system/control.php
+12 -2
View File
@@ -535,9 +535,17 @@ class system extends control
* @access public
* @return void
*/
public function browse(int $productID, string $branch, string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1)
public function browse(int $productID, int $projectID = 0, string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1)
{
$this->commonAction($productID, $branch);
if($projectID)
{
$this->loadModel('project')->setMenu($projectID);
$productID = $this->loadModel('product')->getProductIDByProject($projectID);
}
else
{
$this->commonAction($productID);
}
$this->app->loadClass('pager', true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
@@ -550,7 +558,9 @@ class system extends control
$this->view->title = $this->lang->system->browse;
$this->view->productID = $productID;
$this->view->projectID = $projectID;
$this->view->appList = $systems;
$this->view->releases = $this->loadModel('release')->getPairs();
$this->view->appPairs = $this->system->getPairs();
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
module/system/ui/browse.html.php
+3 -2
View File
@@ -14,7 +14,8 @@ $canCreate = hasPriv('system', 'create');
$createLink = $this->createLink('system', 'create', 'productID=' . $productID);
$createItem = array('text' => $lang->system->create, 'url' => $createLink, 'class' => 'primary', 'icon' => 'plus', 'data-toggle' => 'modal');
$config->system->dtable->fieldList['children']['map'] = $appPairs;
$config->system->dtable->fieldList['children']['map'] = $appPairs;
$config->system->dtable->fieldList['latestRelease']['map'] = $releases;
$tableData = initTableData($appList, $config->system->dtable->fieldList, $this->system);
featureBar
@@ -36,7 +37,7 @@ dtable
(
set::cols($config->system->dtable->fieldList),
set::data($tableData),
set::sortLink(createLink('system', 'browse', "productID={$productID}&branch={$branch}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::sortLink(createLink('system', 'browse', "productID={$productID}&projectID={$projectID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBy($orderBy),
set::footPager(usePager())
);