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

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

Browse Source
This commit is contained in:
holan20180123
2021-03-24 13:53:15 +08:00
parent cea111abed fbde724d27
commit 7205b2c240
4 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/zh-cn.php
-1
View File
@@ -98,7 +98,6 @@ $lang->action->objectTypes['stakeholder'] = '干系人';
$lang->action->objectTypes['budget'] = '费用估算';
$lang->action->objectTypes['entry'] = '应用';
$lang->action->objectTypes['webhook'] = 'Webhook';
$lang->action->objectTypes['job'] = '构建';
/* 用来描述操作历史记录。*/
$lang->action->desc = new stdclass();
module/my/control.php
+30 -19
View File
@@ -127,9 +127,11 @@ class my extends control
$uri = $this->app->getURI(true);
if($this->app->viewType != 'json')
{
$this->session->set('todoList', $uri);
$this->session->set('bugList', $uri);
$this->session->set('taskList', $uri);
$this->session->set('todoList', $uri, 'my');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('storyList', $uri, 'product');
$this->session->set('testtaskList', $uri, 'qa');
}
/* Load pager. */
@@ -182,7 +184,7 @@ class my extends control
public function story($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true));
if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true), 'product');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -223,7 +225,7 @@ class my extends control
public function requirement($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true));
if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true), 'product');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -264,10 +266,7 @@ class my extends control
public function task($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
if($this->app->viewType != 'json')
{
$this->session->set('taskList', $this->app->getURI(true), 'execution');
}
if($this->app->viewType != 'json') $this->session->set('taskList', $this->app->getURI(true), 'execution');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -897,16 +896,28 @@ class my extends control
{
/* Save session. */
$uri = $this->app->getURI(true);
$this->session->set('productList', $uri);
$this->session->set('productPlanList', $uri);
$this->session->set('releaseList', $uri);
$this->session->set('storyList', $uri);
$this->session->set('projectList', $uri);
$this->session->set('taskList', $uri);
$this->session->set('buildList', $uri);
$this->session->set('bugList', $uri);
$this->session->set('caseList', $uri);
$this->session->set('testtaskList', $uri);
$this->session->set('productList', $uri );
$this->session->set('storyList', $uri );
$this->session->set('designList', $uri );
$this->session->set('productPlanList', $uri );
$this->session->set('releaseList', $uri );
$this->session->set('programList', $uri );
$this->session->set('projectList', $uri );
$this->session->set('executionList', $uri );
$this->session->set('taskList', $uri );
$this->session->set('buildList', $uri );
$this->session->set('bugList', $uri );
$this->session->set('caseList', $uri );
$this->session->set('caselibList', $uri );
$this->session->set('testsuiteList', $uri );
$this->session->set('testtaskList', $uri );
$this->session->set('reportList', $uri );
$this->session->set('docList', $uri );
$this->session->set('todoList', $uri );
$this->session->set('riskList', $uri );
$this->session->set('issueList', $uri );
$this->session->set('userList', $uri );
$this->session->set('stakeholderList', $uri );
/* Set the pager. */
$this->app->loadClass('pager', $static = true);
module/program/view/browsebylist.html.php
+2
View File
@@ -121,6 +121,8 @@
#programTableList.sortable-sorting > tr.drag-row {opacity: 1;}
#programTableList > tr.drop-not-allowed {opacity: 0.1!important}
#programList .c-actions {overflow: visible;}
#programList > thead > tr > th .table-nest-toggle-global {top:5px}
#programList > thead > tr > th .table-nest-toggle-global:before {color: #abafbc;}
#programTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
#programTableList .icon-project:before {content: '\e99c'; width: 22px; height: 22px; background: none; color: #16a8f8; top: 0; line-height: 22px; margin-right: 2px; font-size: 14px}
</style>
module/user/control.php
-1
View File
@@ -825,7 +825,6 @@ class user extends control
$this->send($response);
}
if((!empty($this->config->safe->loginCaptcha) and strtolower($this->post->captcha) != strtolower($this->session->captcha) and $this->app->getViewType() != 'json'))
{
$response['result'] = 'fail';