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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
wangyidong
2021-04-09 16:53:57 +08:00
parent f1349cba2c dc0b429db4
commit 3da94c38fa
5 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menu.php
+1 -1
View File
@@ -226,7 +226,7 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang->
/* Execution menu. */
$lang->execution->homeMenu = new stdclass();
if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
$lang->execution->homeMenu->list = array('link' => "{$lang->executionCommon}|execution|all|", 'alias' => 'create,batchedit');
$lang->execution->homeMenu->list = array('link' => "{$lang->executionCommon}列表|execution|all|", 'alias' => 'create,batchedit');
$lang->execution->menu = new stdclass();
$lang->execution->menu->task = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
module/doc/control.php
+2
View File
@@ -243,6 +243,7 @@ class doc extends control
$libTypeList = $this->lang->doc->libTypeList;
if(empty($products)) unset($libTypeList['product']);
if(empty($projects)) unset($libTypeList['project']);
if(empty($executions)) unset($libTypeList['execution']);
$this->view->groups = $this->loadModel('group')->getPairs();
@@ -622,6 +623,7 @@ class doc extends control
{
$doc = $this->doc->getByID($docID);
$objectType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($doc->lib)->fetch('type');
if($this->config->systemMode == 'classic' and $objectType == 'project') $objectType = 'execution';
$this->doc->delete(TABLE_DOC, $docID);
/* if ajax request, send result. */
module/doc/view/editlib.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
</tr>
<tr>
<th><?php echo $lang->doclib->control;?></th>
<?php if($lib->type == 'product' or $lib->type == 'execution' or $config->systemMode == 'classic'):?>
<?php if($lib->type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom' )):?>
<td>
<?php echo html::radio('acl', $lang->doclib->aclListA, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'")?>
<span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['lib'][$lib->type][$lib->acl];?></span>
module/execution/control.php
+1 -2
View File
@@ -2287,7 +2287,7 @@ class execution extends control
$products = $this->project->getProducts($objectID);
$browseLink = $this->createLink($this->app->openApp == 'project' ? 'projectstory' : 'execution', 'story', "objectID=$objectID");
$this->session->set('storyList', $this->app->getURI(true), 'product'); // Save session.
$this->session->set('storyList', $this->app->getURI(true), $this->app->openApp); // Save session.
/* Only execution can have no products. */
if(empty($products))
@@ -2723,7 +2723,6 @@ class execution extends control
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->status = $status;
$this->view->from = $from;
$this->view->projectTree = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list');
$this->display();
}
module/execution/view/all.html.php
-14
View File
@@ -27,14 +27,6 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
@-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
</style>
<div id='mainMenu' class='clearfix'>
<?php if($from == 'execution'):?>
<div id="sidebarHeader">
<div class="title">
<?php echo empty($projectID) ? $lang->project->common : zget($projects, $projectID);?>
<?php if($projectID) echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod), "<i class='icon icon-sm icon-close'></i>", '', 'class="text-muted"');?>
</div>
</div>
<?php endif;?>
<div class='btn-toolbar pull-left'>
<?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
<?php echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), "<span class='text'>{$label}</span>", '', "class='btn btn-link' id='{$key}Tab' data-app='$from'");?>
@@ -46,12 +38,6 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
</div>
</div>
<div id='mainContent' class="main-row fade">
<?php if($from == 'execution'):?>
<div id="sidebar" class="side-col">
<div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
<div class="cell"><?php echo $projectTree;?></div>
</div>
<?php endif;?>
<?php $canBatchEdit = common::hasPriv('execution', 'batchEdit'); ?>
<form class='main-table' id='executionsForm' method='post' action='<?php echo inLink('batchEdit');?>' data-ride='table'>
<table class='table has-sort-head table-fixed' id='executionList'>