diff --git a/module/design/config.php b/module/design/config.php index 9d9a5be657..1a7751beee 100644 --- a/module/design/config.php +++ b/module/design/config.php @@ -43,6 +43,7 @@ $config->design->actionList['viewCommit']['hint'] = $lang->design->view $config->design->actionList['viewCommit']['url'] = helper::createLink('design', 'viewCommit', 'designID={id}'); $config->design->actionList['viewCommit']['data-toggle'] = 'modal'; $config->design->actionList['viewCommit']['data-position'] = 'center'; +$config->design->actionList['viewCommit']['data-id'] = 'viewCommitModal'; $config->design->actionList['delete']['icon'] = 'trash'; $config->design->actionList['delete']['hint'] = $lang->design->delete; diff --git a/module/design/control.php b/module/design/control.php index 2fdf1d8b01..6fb00e78f4 100755 --- a/module/design/control.php +++ b/module/design/control.php @@ -365,7 +365,8 @@ class design extends control { $this->design->unlinkCommit($designID, $commitID); - return $this->sendSuccess(array('load' => array('url' => inlink('viewCommit', "designID={$designID}"), 'selector' => '.modal-dialog'))); + $link = inlink('viewCommit', "designID={$designID}"); + return $this->sendSuccess(array('callback' => "loadModal(\"$link\", 'viewCommitModal');")); } /** diff --git a/module/design/ui/viewcommit.html.php b/module/design/ui/viewcommit.html.php index 3a823b701e..f1b71150e0 100644 --- a/module/design/ui/viewcommit.html.php +++ b/module/design/ui/viewcommit.html.php @@ -17,7 +17,8 @@ $linkCommitItem = $canLinkCommit ? btn( set::icon('plus'), set::text($lang->design->linkCommit), set::type('primary'), - set('data-url', createLink('design', 'linkCommit', "designID=$design->id")), + set('url', createLink('design', 'linkCommit', "designID=$design->id")), + set('data-load', 'modal'), ) : null; if(empty($design->commit))