From e667ba15db77a63d2042cde1ea1a6927cc5e8cf9 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 19 Aug 2022 11:33:10 +0800 Subject: [PATCH 1/2] * Get the execution list. --- api/v1/entries/executions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1/entries/executions.php b/api/v1/entries/executions.php index 9a00ae719b..a3275395c7 100644 --- a/api/v1/entries/executions.php +++ b/api/v1/entries/executions.php @@ -41,7 +41,7 @@ class executionsEntry extends entry else { $control = $this->loadController('execution', 'all'); - $control->all($this->param('status', 'all'), $this->param('project', $projectID), $this->param('order', 'id_desc'), 0, 0, $this->param('limit', 20), $this->param('page', 1)); + $control->all($this->param('status', 'all'), $this->param('order', 'id_desc'), 0, '', 0, $this->param('limit', 20), $this->param('page', 1)); $data = $this->getData(); if(!$data or !isset($data->status)) return $this->sendError(400, 'error'); From b47cd1b77b59a061741ae68e486c30f9e259b0c7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 19 Aug 2022 11:36:05 +0800 Subject: [PATCH 2/2] * Fixed an issue where the admin could not click on the program. --- module/program/view/browsebylist.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 5684629bfa..53c2ce2b3e 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -58,7 +58,7 @@ ?> type == 'program'):?> - user->view->programs},", ",$program->id,") !== false ? html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name) : $program->name;?> + user->admin or strpos(",{$app->user->view->programs},", ",$program->id,") !== false) ? html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name) : $program->name;?> createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name, '', 'class="text-ellipsis text-primary"');?>