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

Merge remote-tracking branch 'origin/release-20.0'

Browse Source
This commit is contained in:
tianshujie
2024-04-23 17:12:24 +08:00
parent 63d51564de 8856db689c
commit bced2b76b4
191 changed files with 1353 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/config/dtable.php
+1 -1
View File
@@ -80,7 +80,7 @@ $config->mr->taskDtable->fieldList['pri']['show'] = true;
$config->mr->taskDtable->fieldList['assignedTo']['type'] = 'desc';
$config->mr->taskDtable->fieldList['assignedTo']['title'] = $lang->task->assignedTo;
$config->mr->taskDtable->fieldList['assignedTo']['currentUser'] = $app->user->account;
$config->mr->taskDtable->fieldList['assignedTo']['currentUser'] = '';
$config->mr->taskDtable->fieldList['assignedTo']['sortType'] = true;
$config->mr->taskDtable->fieldList['assignedTo']['show'] = true;
module/mr/config/form.php
-3
View File
@@ -1,5 +1,4 @@
<?php
global $app;
$config->mr->form = new stdclass();
$config->mr->form->create = array();
$config->mr->form->create['hostID'] = array('type' => 'int', 'required' => true);
@@ -16,7 +15,6 @@ $config->mr->form->create['removeSourceBranch'] = array('type' => 'int', 'req
$config->mr->form->create['squash'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->mr->form->create['jobID'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->mr->form->create['description'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->mr->form->create['createdBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->mr->form->create['createdDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
$config->mr->form->edit = array();
@@ -29,5 +27,4 @@ $config->mr->form->edit['removeSourceBranch'] = array('type' => 'int', 'requi
$config->mr->form->edit['squash'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->mr->form->edit['jobID'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->mr->form->edit['description'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->mr->form->edit['editedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->mr->form->edit['editedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
module/mr/control.php
+2
View File
@@ -196,6 +196,7 @@ class mr extends control
{
$MR = form::data($this->config->mr->form->create)
->setIF($this->post->needCI == 0, 'jobID', 0)
->add('createdBy', $this->app->user->account)
->get();
$result = $this->mr->create($MR);
return $this->send($result);
@@ -260,6 +261,7 @@ class mr extends control
{
$MR = form::data($this->config->mr->form->edit)
->setIF($this->post->needCI == 0, 'jobID', 0)
->add('editedBy', $this->app->user->account)
->get();
$result = $this->mr->update($MRID, $MR);
return $this->send($result);
module/mr/ui/link.html.php
+3 -1
View File
@@ -59,7 +59,9 @@ $bugCols['title']['link'] = array('module' => 'bug', 'method' => 'view',
$bugs = initTableData($bugs, $bugCols);
$taskCols = $config->mr->taskDtable->fieldList;
$taskCols['actions'] = $actionMenu;
$taskCols['assignedTo']['currentUser'] = $app->user->account;
$taskCols['actions'] = $actionMenu;
$taskCols['actions']['list']['unlink']['data-confirm'] = $lang->mr->confirmUnlinkTask;
$taskCols['actions']['list']['unlink']['url'] = $this->createLink('mr', 'unlink', "MRID=$MR->id&productID=$product->id&type=task&linkID={id}&confirm=yes");
module/mr/ui/linktask.html.php
+1
View File
@@ -46,6 +46,7 @@ div
$lang->repo->unlinkedTasks . "({$pager->recTotal})"
)
);
$config->repo->taskDtable->fieldList['assignedTo']['currentUser'] = $app->user->account;
$allTasks = initTableData($allTasks, $config->repo->taskDtable->fieldList);
$data = array_values($allTasks);
dtable