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

* [bug#56709,done,0.5h] fix bug.

Browse Source
This commit is contained in:
sunguangming
2024-11-04 10:01:51 +08:00
committed by 王怡栋
parent 127b2bcccf
commit 7db9c759ed
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/file/model.php
+4 -2
View File
@@ -463,7 +463,8 @@ class fileModel extends model
*/
public function setSavePath(): void
{
$savePath = $this->app->getAppRoot() . "www/data/upload/{$this->app->company->id}/" . date('Ym/', $this->now);
$companyID = isset($this->app->company->id) ? $this->app->company->id : 1;
$savePath = $this->app->getAppRoot() . "www/data/upload/{$companyID}/" . date('Ym/', $this->now);
if(!file_exists($savePath))
{
mkdir($savePath, 0777, true);
@@ -480,7 +481,8 @@ class fileModel extends model
*/
public function setWebPath(): void
{
$this->webPath = $this->app->getWebRoot() . "data/upload/{$this->app->company->id}/";
$companyID = isset($this->app->company->id) ? $this->app->company->id : 1;
$this->webPath = $this->app->getWebRoot() . "data/upload/{$companyID}/";
}
/**
module/program/config/form.php
+3 -4
View File
@@ -2,7 +2,6 @@
$now = helper::now();
$today = helper::today();
global $app;
$config->program->form = new stdclass();
$config->program->form->create['parent'] = array('type' => 'int', 'control' => 'picker', 'required' => false, 'default' => 0);
@@ -31,16 +30,16 @@ $config->program->form->edit['whitelist'] = array('type' => 'array', 'contro
$config->program->form->close['realEnd'] = array('type' => 'date', 'required' => true, 'default' => $now, 'filter' => 'trim');
$config->program->form->close['status'] = array('type' => 'string', 'required' => false, 'default' => 'closed');
$config->program->form->close['closedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->program->form->close['closedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->program->form->close['closedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->program->form->close['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->program->form->close['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->program->form->close['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->program->form->activate['begin'] = array('type' => 'date', 'required' => false, 'default' => null, 'filter' => 'trim');
$config->program->form->activate['end'] = array('type' => 'date', 'required' => false, 'default' => null, 'filter' => 'trim');
$config->program->form->activate['status'] = array('type' => 'string', 'required' => false, 'default' => 'doing');
$config->program->form->activate['realEnd'] = array('type' => 'date', 'required' => false, 'default' => null);
$config->program->form->activate['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->program->form->activate['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->program->form->activate['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->program->form->start['realBegan'] = array('type' => 'date', 'required' => true, 'default' => $today, 'filter' => 'trim');
$config->program->form->start['comment'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor');
module/program/control.php
+6 -2
View File
@@ -241,7 +241,11 @@ class program extends control
$hasUnfinished = $this->program->hasUnfinishedChildren($program);
if($hasUnfinished) return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.alert('{$this->lang->program->closeErrorMessage}');"));
$programData = form::data(null, $programID)->get();
$programData = form::data(null, $programID)
->add('closedBy', $this->app->user->account)
->add('lastEditedBy', $this->app->user->account)
->get();
$changes = $this->program->close($programData, $program);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -316,7 +320,7 @@ class program extends control
if(!empty($_POST))
{
$programData = form::data(null, $programID)->get();
$programData = form::data(null, $programID)->add('lastEditedBy', $this->app->user->account)->get();
$changes = $this->program->activate($programData, $program);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));