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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2019-12-12 13:50:08 +08:00
parent 2ff715ce71 46b48a5363
commit 4640b5dabb
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+11 -1
View File
@@ -1296,7 +1296,17 @@ class bug extends control
else
{
$this->bug->delete(TABLE_BUG, $bugID);
if($bug->toTask != 0) echo js::alert($this->lang->bug->remindTask . $bug->toTask);
if($bug->toTask != 0)
{
$task = $this->task->getById($bug->toTask);
if($task->deleted != '1')
{
$confirmURL = $this->createLink('task', 'view', "taskID=$bug->toTask");
unset($_GET['onlybody']);
$cancelURL = $this->createLink('bug', 'view', "bugID=$bugID");
die(js::confirm(sprintf($this->lang->bug->remindTask, $bug->toTask), $confirmURL, $cancelURL, 'parent', 'parent.parent'));
}
}
$this->executeHooks($bugID);
module/file/model.php
+2 -2
View File
@@ -781,9 +781,9 @@ class fileModel extends model
$data->objectID = $objectID;
$data->objectType = $objectType;
$data->extra = 'editor';
if(isset($_SESSION['album'][$uid]) and $_SESSION['album'][$uid])
if(isset($_SESSION['album']['used'][$uid]) and $_SESSION['album']['used'][$uid])
{
$this->dao->update(TABLE_FILE)->data($data)->where('id')->in($_SESSION['album'][$uid])->exec();
$this->dao->update(TABLE_FILE)->data($data)->where('id')->in($_SESSION['album']['used'][$uid])->exec();
return !dao::isError();
}
}