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

* Finish task#36031,task#36011,task#36012,task#36016.

Browse Source
This commit is contained in:
leiyong
2021-02-19 13:31:18 +08:00
parent 6bf40e474d
commit 8a7983c5a0
7 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/zh-cn.php
+1 -1
View File
@@ -183,7 +183,7 @@ $lang->product->menu->list = array('link' => $lang->productCommon . '|product|al
$lang->product->viewMenu = new stdclass();
$lang->product->viewMenu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->viewMenu->story = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->viewMenu->track = array('link' => "跟踪矩阵|story|track|productID=%s");
$lang->product->viewMenu->track = array('link' => "矩阵|story|track|productID=%s");
$lang->product->viewMenu->plan = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan');
$lang->product->viewMenu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->viewMenu->roadmap = '路线图|product|roadmap|productID=%s';
module/common/lang/zh-tw.php
+1 -1
View File
@@ -183,7 +183,7 @@ $lang->product->menu->list = array('link' => $lang->productCommon . '|product|al
$lang->product->viewMenu = new stdclass();
$lang->product->viewMenu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->viewMenu->story = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->viewMenu->track = array('link' => "跟蹤矩陣|story|track|productID=%s");
$lang->product->viewMenu->track = array('link' => "矩陣|story|track|productID=%s");
$lang->product->viewMenu->plan = array('link' => "計劃|productplan|browse|productID=%s", 'subModule' => 'productplan');
$lang->product->viewMenu->release = array('link' => '發佈|release|browse|productID=%s', 'subModule' => 'release');
$lang->product->viewMenu->roadmap = '路線圖|product|roadmap|productID=%s';
module/custom/control.php
+6 -7
View File
@@ -405,7 +405,7 @@ class custom extends control
* @return void
*/
public function browseStoryConcept()
{
{
/* Process menu.*/
$this->app->loadLang('custom');
$this->lang->custom->menu = $this->lang->subject->menu;
@@ -475,24 +475,23 @@ class custom extends control
}
/**
* Delete story concept.
* @param int $key
*
* Set story concept.
*
* @param int $key
* @access public
* @return void
*/
public function setDefaultConcept($key = 0)
{
$this->loadModel('setting')->setItem('system.custom.URSR', $key);
die(js::locate(inlink('browseStoryConcept'), 'parent'));
die(js::reload('parent'));
}
/**
* Delete story concept.
*
* @param int $key
* @param string $confirm yse|no
*
* @access public
* @return void
*/
module/index/js/index.js
+1 -1
View File
@@ -75,7 +75,7 @@
}
return 'doc';
}
if(moduleName === 'custom' && ['estimate', 'browsestoryconcept', 'configurescrum'].includes(methodLowerCase))
if(moduleName === 'custom' && ['estimate', 'browsestoryconcept', 'configurescrum', 'setdefaultconcept'].includes(methodLowerCase))
{
return 'system';
}
module/project/model.php
+8 -6
View File
@@ -3586,12 +3586,14 @@ class projectModel extends model
$isView = (empty($this->app->user->view->sprints) || empty($this->app->user->view->projects)) ? false : true;
if(!$this->app->user->admin && $isView === false) return array();
$executions = $this->dao->select('id,project,code,name,type')->from(TABLE_PROJECT)
->where('type')->in('stage,sprint')
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
->beginIF(!$this->app->user->admin)->andWhere('project')->in($this->app->user->view->projects)->fi()
->andWhere('status')->ne('closed')
->andWhere('deleted')->eq('0')
$executions = $this->dao->select('t1.id,t1.project,t1.code,t1.name,t1.type')->from(TABLE_PROJECT)->alias('t1')
->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
->where('t1.type')->in('stage,sprint')
->andWhere('t2.account')->eq($this->app->user->account)
->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->projects)->fi()
->andWhere('t1.status')->ne('closed')
->andWhere('t1.deleted')->eq('0')
->orderBy('id_desc')
->fetchAll();
module/story/view/track.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<div class='main-table' data-ride="table">
<table class='table table-bordered' id="trackList">
<thead>
<tr>
<tr class='text-center'>
<th <?php echo $style;?>>
<?php if($this->app->rawModule == 'projectstory'): ?>
<div class="dropdown">
module/user/view/deny.html.php
+7 -1
View File
@@ -55,16 +55,22 @@ include '../../common/view/header.lite.html.php';
</div>
</div>
</div>
<?php js::set('isOnlybody', $isOnlybody);?>
<?php js::set('indexLink', helper::createLink('my', 'index'));?>
</body>
<script>
/* Click my site to modify the left navigation. */
function changeLeftNavigation()
{
if(window.parent && window.parent.$.tabs)
if(window.parent && window.parent.$.tabs && isOnlybody)
{
window.parent.$.tabs.close();
window.parent.$.tabs.open('my');
}
else
{
window.location.href = indexLink;
}
}
</script>
</html>