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

* [bug#57857,done,1.5h] show files in release::edit.

Browse Source
This commit is contained in:
liumengyi
2024-12-30 09:51:11 +08:00
committed by 刘刚
parent 39769f3eb6
commit 8ffd9f9545
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/projectrelease/control.php
+1
View File
@@ -164,6 +164,7 @@ class projectrelease extends control
/* Set edit config. */
$this->config->projectrelease->edit = $this->config->release->edit;
$release = $this->release->getByID($releaseID);
$release->files = $this->loadModel('file')->getByObject('release', $releaseID);
if(!empty($_POST))
{
module/release/config/form.php
+2
View File
@@ -28,3 +28,5 @@ $config->release->form->edit['desc'] = array('type' => 'string', '
$config->release->form->edit['mailto'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->release->form->edit['product'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->release->form->edit['branch'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->release->form->edit['deleteFiles'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->release->form->edit['renameFiles'] = array('type' => 'array', 'required' => false, 'default' => array());
module/release/control.php
+1
View File
@@ -161,6 +161,7 @@ class release extends control
public function edit(int $releaseID)
{
$release = $this->release->getByID($releaseID);
$release->files = $this->loadModel('file')->getByObject('release', $releaseID);
if(!empty($_POST))
{
module/release/model.php
+2 -2
View File
@@ -478,7 +478,7 @@ class releaseModel extends model
if($release->status == 'wait') $release->releasedDate = null;
$this->dao->update(TABLE_RELEASE)->data($release, 'deleteFiles')
$this->dao->update(TABLE_RELEASE)->data($release, 'deleteFiles,renameFiles')
->autoCheck()
->batchCheck($this->config->release->edit->requiredFields, 'notempty')
->check('name', 'unique', "`id` != '{$oldRelease->id}' AND `system` = '{$release->system}' AND `deleted` = '0'")
@@ -496,7 +496,7 @@ class releaseModel extends model
if($release->date != $oldRelease->date) $shadowBuild['date'] = $release->date;
if($shadowBuild) $this->dao->update(TABLE_BUILD)->data($shadowBuild)->where('id')->eq($oldRelease->shadow)->exec();
$this->file->processFile4Object('release', $oldRelease, $release);
$this->file->processFileDiffsForObject('release', $oldRelease, $release);
return common::createChanges($oldRelease, $release);
}
module/release/ui/edit.html.php
+1 -1
View File
@@ -135,7 +135,7 @@ formPanel
formGroup
(
set::label($lang->release->files),
fileSelector()
fileSelector($release->files ? set::defaultFiles(array_values($release->files)) : null)
),
formHidden('product', $release->product)
);