diff --git a/module/story/control.php b/module/story/control.php index dd79e449c9..384cbb5c76 100755 --- a/module/story/control.php +++ b/module/story/control.php @@ -706,6 +706,8 @@ class story extends control $action = $story->status == 'changing' ? 'recalledChange' : 'Recalled'; $this->loadModel('action')->create('story', $storyID, $action); + if($from == 'modal') return $this->send(array('result' => 'success', 'load' => 'modal')); + $locateLink = $this->session->storyList ? $this->session->storyList : $this->createLink('product', 'browse', "productID={$story->product}"); if($from == 'view') { diff --git a/module/story/ui/view.html.php b/module/story/ui/view.html.php index 51ca346612..4e368cc4a4 100644 --- a/module/story/ui/view.html.php +++ b/module/story/ui/view.html.php @@ -177,6 +177,7 @@ $versionBtn = count($versions) > 1 ? to::title(dropdown set::items($versions) )) : null; +if($isInModal) $config->story->actionList['recall']['url'] = str_replace('&from=view&', '&from=modal&', $config->story->actionList['recall']['url']); if($story->status == 'changing') $config->story->actionList['recall']['text'] = $lang->story->recallChange; $hasRepo = $this->loadModel('repo')->getListByProduct($story->product, 'Gitlab,Gitea,Gogs,GitFox', 1); $actions = $story->deleted ? array() : $this->loadModel('common')->buildOperateMenu($story);