From 13a16c2020bf3d2b916a84d45b407fbfb193fce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Mon, 25 Jul 2022 13:34:13 +0800 Subject: [PATCH] * Add User api param. --- api/v1/entries/user.php | 10 +++++----- module/my/control.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php index b4d2dba06e..5be0be2c25 100644 --- a/api/v1/entries/user.php +++ b/api/v1/entries/user.php @@ -210,7 +210,7 @@ class userEntry extends Entry if(!common::hasPriv('my', 'work')) break; $control = $this->loadController('my', 'bug'); - $control->bug($this->param('type', 'assignedTo'), $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 5), $this->param('page', 1)); + $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(); if($data->status == 'success') @@ -266,7 +266,7 @@ class userEntry extends Entry if(!common::hasPriv('my', 'work')) break; $control = $this->loadController('my', 'story'); - $control->story($this->param('type', 'assignedTo'), $this->param('order', 'id_desc'), $this->param('total', 0), $this->param('limit', 5), $this->param('page', 1)); + $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(); if($data->status == 'success') @@ -290,7 +290,7 @@ class userEntry extends Entry if($this->config->edition == 'max') { $control = $this->loadController('my', 'issue'); - $control->issue('createdBy', 'id_desc', 0, $this->param('limit', 5), 1); + $control->issue('createdBy', 0, 'id_desc', 0, $this->param('limit', 5), 1); $data = $this->getData(); if($data->status == 'success') @@ -307,7 +307,7 @@ class userEntry extends Entry if($this->config->edition == 'max') { $control = $this->loadController('my', 'risk'); - $control->risk('createdBy', 'id_desc', 0, $this->param('limit', 5), 1); + $control->risk('createdBy', 0, 'id_desc', 0, $this->param('limit', 5), 1); $data = $this->getData(); if($data->status == 'success') @@ -324,7 +324,7 @@ class userEntry extends Entry if($this->config->edition == 'max') { $control = $this->loadController('my', 'myMeeting'); - $control->myMeeting('all', 'id_desc', 0, $this->param('limit', 5), 1); + $control->myMeeting('all', '', 'id_desc', 0, $this->param('limit', 5), 1); $data = $this->getData(); if($data->status == 'success') diff --git a/module/my/control.php b/module/my/control.php index f9b16e7c7a..ce8c8a2cd1 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -895,7 +895,7 @@ EOF; * @param int $pageID * @return void */ - public function risk($type = 'assignedTo', $param = 0,$orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function risk($type = 'assignedTo', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { /* Set the pager. */ $this->loadModel('risk');