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

* Finish task #110591 for peer testing.

Browse Source
This commit is contained in:
chaideqing
2024-01-17 08:49:23 +08:00
parent b66b3d6fd8
commit c5a1f3a499
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update18.10.sql
+1 -1
View File
@@ -3,4 +3,4 @@ ALTER TABLE `zt_project` ADD COLUMN `parallel` mediumint(9) NOT NULL DEFAULT '0'
ALTER TABLE `zt_demand` CHANGE `product` `product` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `zt_story` ADD COLUMN `retractedReason` ENUM('', 'omit', 'other') NOT NULL DEFAULT '';
ALTER TABLE `zt_story` ADD COLUMN `retractedBy` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `zt_story` ADD COLUMN `retractedDate` datetime NOT NULL;
ALTER TABLE `zt_story` ADD COLUMN `retractedDate` datetime;
module/action/model.php
+3 -3
View File
@@ -649,10 +649,10 @@ class actionModel extends model
$action->extra = sprintf($this->lang->execution->action->extra, '<strong>' . join(', ', $linkedProducts) . '</strong>');
}
}
elseif($objectType == 'story' && $actionName == 'retracted')
elseif($objectType == 'demand' && $actionName == 'retracted')
{
$story = $this->loadModel('story')->getById($objectID);
$action->extra = "#{$story->id} {$this->lang->story->title} {$story->title}";
$story = $this->loadModel('story')->getById($action->extra);
$action->extra = "#{$action->extra} {$this->lang->story->title} " . html::a(helper::createLink('story', 'view', "storyID=$story->id"), "$story->title");
}
$action->history = isset($histories[$actionID]) ? $histories[$actionID] : array();