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

Merge branch 'cyy_api' into 'master'

Browse Source 
* Fix bug #27158.

See merge request easycorp/zentaopms!5297
This commit is contained in:
李玉春
2022-09-09 08:15:19 +00:00
parent 0881e39c54 f8fdeafb3a
commit 8e69bd23d7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/testcases.php
+1 -1
View File
@@ -26,7 +26,7 @@ class testcasesEntry extends entry
$this->app->cookie->caseModule = 0;
$this->app->cookie->caseSuite = 0;
$type = 'all';
$type = $this->param('status', 'all');
$param = 0;
$moduleID = $this->param('module', 0);
if($moduleID)
api/v1/entries/user.php
+12
View File
@@ -196,6 +196,8 @@ class userEntry extends Entry
if(!common::hasPriv('my', 'work')) break;
$this->config->openMethods[] = 'my.task';
global $app;
$app->rawMethod = 'work';
$control = $this->loadController('my', 'task');
$control->task($this->param('type', 'assignedTo'), 0, $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 5), $this->param('page', 1));
$data = $this->getData();
@@ -212,6 +214,8 @@ class userEntry extends Entry
if(!common::hasPriv('my', 'work')) break;
$this->config->openMethods[] = 'my.bug';
global $app;
$app->rawMethod = 'work';
$control = $this->loadController('my', 'bug');
$control->bug($this->param('type', 'assignedTo'), 0, $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 5), $this->param('page', 1));
$data = $this->getData();
@@ -269,6 +273,8 @@ class userEntry extends Entry
if(!common::hasPriv('my', 'work')) break;
$this->config->openMethods[] = 'my.story';
global $app;
$app->rawMethod = 'work';
$control = $this->loadController('my', 'story');
$control->story($this->param('type', 'assignedTo'), 0, $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 5), $this->param('page', 1));
$data = $this->getData();
@@ -293,6 +299,8 @@ class userEntry extends Entry
if($this->config->edition == 'max')
{
global $app;
$app->rawMethod = 'work';
$this->config->openMethods[] = 'my.issue';
$control = $this->loadController('my', 'issue');
$control->issue('createdBy', 0, 'id_desc', 0, $this->param('limit', 5), 1);
@@ -311,6 +319,8 @@ class userEntry extends Entry
if($this->config->edition == 'max')
{
global $app;
$app->rawMethod = 'work';
$this->config->openMethods[] = 'my.risk';
$control = $this->loadController('my', 'risk');
$control->risk('assignedTo', 0, 'id_desc', 0, $this->param('limit', 5), 1);
@@ -329,6 +339,8 @@ class userEntry extends Entry
if($this->config->edition == 'max')
{
global $app;
$app->rawMethod = 'work';
$this->config->openMethods[] = 'my.myMeeting';
$control = $this->loadController('my', 'myMeeting');
$control->myMeeting('futureMeeting', '', 'id_desc', 0, $this->param('limit', 5), 1);