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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-06-18 09:25:54 +08:00
parent b7caec933d abe711e334
commit 5ee795330e
4 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/control.php
+20 -17
View File
@@ -28,23 +28,26 @@ class action extends control
/* Save session. */
$uri = $this->app->getURI(true);
$this->session->set('productList', $uri, 'product');
$this->session->set('productPlanList', $uri, 'product');
$this->session->set('storyList', $uri, 'product');
$this->session->set('releaseList', $uri, 'product');
$this->session->set('programList', $uri, 'program');
$this->session->set('projectList', $uri, 'project');
$this->session->set('executionList', $uri, 'execution');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('buildList', $uri, 'execution');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('caseList', $uri, 'qa');
$this->session->set('testtaskList', $uri, 'qa');
$this->session->set('docList', $uri, 'doc');
$this->session->set('opportunityList', $uri, 'project');
$this->session->set('riskList', $uri, 'project');
$this->session->set('trainplanList', $uri, 'project');
$this->session->set('roomList', $uri, 'admin');
$this->session->set('productList', $uri, 'product');
$this->session->set('productPlanList', $uri, 'product');
$this->session->set('storyList', $uri, 'product');
$this->session->set('releaseList', $uri, 'product');
$this->session->set('programList', $uri, 'program');
$this->session->set('projectList', $uri, 'project');
$this->session->set('executionList', $uri, 'execution');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('buildList', $uri, 'execution');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('caseList', $uri, 'qa');
$this->session->set('testtaskList', $uri, 'qa');
$this->session->set('docList', $uri, 'doc');
$this->session->set('opportunityList', $uri, 'project');
$this->session->set('riskList', $uri, 'project');
$this->session->set('trainplanList', $uri, 'project');
$this->session->set('roomList', $uri, 'admin');
$this->session->set('researchplanList', $uri, 'project');
$this->session->set('researchreportList', $uri, 'project');
$this->session->set('meetingList', $uri, 'project');
/* Get deleted objects. */
$this->app->loadClass('pager', $static = true);
module/action/view/trash.html.php
+3 -3
View File
@@ -68,9 +68,9 @@
}
else
{
$app = '';
if($action->objectType == 'meeting') $app = $action->project ? "data-app='project'" : "data-app='my'";
echo html::a($this->createLink($module, $methodName, $params), $action->objectName, '_self', "title={$action->objectName} $app");
$openApp = '';
if($action->objectType == 'meeting') $openApp = $action->project ? "data-app='project'" : "data-app='my'";
echo html::a($this->createLink($module, $methodName, $params), $action->objectName, '_self', "title={$action->objectName} $openApp");
}
?>
</td>
module/block/config.php
+2
View File
@@ -37,3 +37,5 @@ $config->block->shortBlock['']['contribute'] = 'contribute';
$config->statistic = new stdclass();
$config->statistic->storyStages = array('wait', 'planned', 'developing', 'testing', 'released');
$config->block->workMethods = 'task,story,requirement,bug,testcase,testtask,issue,risk,meeting';
module/block/control.php
+5 -5
View File
@@ -253,7 +253,7 @@ class block extends control
/* The list assigned to me jumps to the work page when click more button. */
$block->moreLink = $this->createLink($moduleName, $method, $vars);
if($moduleName == 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk|meeting', $method))
if($moduleName == 'my' and strpos($this->config->block->workMethods, $method))
{
$block->moreLink = $this->createLink($moduleName, 'work', 'mode=' . $method . '&' . $vars);
}
@@ -1755,7 +1755,7 @@ class block extends control
$today = helper::today();
$now = date('H:i:s', strtotime(helper::now()));
$stmt = $this->dao->select('*')->from(TABLE_MEETING)
$meetings = $this->dao->select('*')->from(TABLE_MEETING)
->Where('deleted')->eq('0')
->andWhere('(date')->gt($today)
->orWhere('(begin')->gt($now)
@@ -1764,9 +1764,9 @@ class block extends control
->andwhere('(host')->eq($this->app->user->account)
->orWhere('participant')->in($this->app->user->account)
->markRight(1)
->orderBy('id_desc');
if(isset($params->meetingNum)) $stmt->limit($params->meetingNum);
$meetings = $stmt->fetchAll();
->orderBy('id_desc')
->beginIF(isset($params->meetingNum))->limit($params->meetingNum)
->fetchAll();
$count['meeting'] = count($meetings);
$this->view->meetings = $meetings;