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

Merge pull request '* Optimize codes.' (#36) from daitingting_bug_fix into master

Browse Source 
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/36
This commit is contained in:
綦新志
2023-05-09 13:29:46 +08:00
parent 1a7e6153dd 0f508687af
commit 51f2828b07
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -680,7 +680,7 @@ class bug extends control
if(!$comment)
{
$changes = $this->bug->update($bug, $oldBug);
if(!$changes) return $this->send($this->bugZen->errorEdit());
if($changes === false) return $this->send($this->bugZen->errorEdit());
}
$this->bugZen->processAfterEdit($bugID, $this->post->comment, $changes);
module/bug/tao.php
+2 -2
View File
@@ -222,13 +222,13 @@ class bugTao extends bugModel
* 更新相关bug。
* Update the linked bug.
*
* @param int $bugID
* @param string $bugID
* @param string $linkBug
* @param string $oldLinkBug
* @access protected
* @return bool
*/
protected function updateLinkBug(int $bugID, string $linkBug, string $oldLinkBug): bool
protected function updateLinkBug(string $bugID, string $linkBug, string $oldLinkBug): bool
{
$linkBugs = explode(',', $linkBug);
$oldLinkBugs = explode(',', $oldLinkBug);
module/bug/test/bug.class.php
+4 -1
View File
@@ -2156,7 +2156,10 @@ class bugTest
$allRelatedLinkBugs = array_merge($addedLinkBugs, $removedLinkBugs, array($bugID));
global $tester;
$linkBugPairs = $tester->dao->select('id,linkBug')->from(TABLE_BUG)->where('id')->in(array_filter($allRelatedLinkBugs))->andWhere('deleted')->eq('0')->fetchPairs();
$linkBugPairs = $tester->dao->select('id, linkBug')->from(TABLE_BUG)
->where('id')->in(array_filter($allRelatedLinkBugs))
->andWhere('deleted')->eq('0')
->fetchPairs();
if(dao::isError()) return dao::getError();
return $linkBugPairs;
module/bug/test/tao/updatelinkbug.php
+2 -2
View File
@@ -44,10 +44,10 @@ cid=1
initData();
$bugIDList = array(1, 2, 3);
$bugIDList = array('1', '2', '3');
$bug = new bugTest();
r($bug->updateLinkBugTest($bugIDList[0], '2', '')) && p('2', ';') && e('1'); //测试关联bug2的关联bug同步更新为1
r($bug->updateLinkBugTest($bugIDList[0], '3', '2')) && p('2;3', ';') && e('~~;1'); //测试关联bug2的关联bug同步更新为空，bug3的关联bug为1
r($bug->updateLinkBugTest($bugIDList[0], '2,3', '3')) && p('2') && e('1'); //测试关联bug2的关联bug同步更新为1
r($bug->updateLinkBugTest($bugIDList[1], '1,3', '1')) && p('3', ';') && e('1,2'); //测试关联bug3的关联bug同步更新为1,2
r($bug->updateLinkBugTest($bugIDList[1], '1,3', '1')) && p('3', ';') && e('1,2'); //测试关联bug3的关联bug同步更新为1,2
module/file/model.php
+1 -1
View File
@@ -1183,7 +1183,7 @@ class fileModel extends model
*/
public function processFile4Object($objectType, $oldObject, $newObject, $extra = '', $filesName = 'files', $labelsName = 'labels')
{
$oldFiles = empty($oldObject->files) ? '' : join(',', array_keys($oldObject->files));
$oldFiles = empty($oldObject->files) ? '' : implode(',', array_keys($oldObject->files));
$deleteFiles = $newObject->deleteFiles;
if(!empty($deleteFiles))
{