diff --git a/db/update18.10.sql b/db/update18.10.sql index ef8a724c1a..1850580fc3 100644 --- a/db/update18.10.sql +++ b/db/update18.10.sql @@ -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; diff --git a/module/action/model.php b/module/action/model.php index f0c5dae5f0..f4bbbc23a4 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -649,10 +649,10 @@ class actionModel extends model $action->extra = sprintf($this->lang->execution->action->extra, '' . join(', ', $linkedProducts) . ''); } } - 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();