diff --git a/lib/base/front/front.class.php b/lib/base/front/front.class.php index 5a0fccc830..72a2832922 100644 --- a/lib/base/front/front.class.php +++ b/lib/base/front/front.class.php @@ -1002,6 +1002,10 @@ EOT; { $js .= "history.back(-1);\n"; } + elseif(strpos($target, '$.apps.open') !== false) + { + $js .= "$target('$url')"; + } else { $js .= "$target.location='$url';\n"; diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index a4ac5c600a..d70eb7a17a 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -42,6 +42,23 @@ $sessionString .= session_name() . '=' . session_id(); collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> id&objectType=doc");?>" title="doc->collect;?>" class='ajaxCollect btn btn-link'> + + config->maxVersion)):?> + "; + echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'"); + echo "'; + } + ?> +
diff --git a/module/story/control.php b/module/story/control.php index fc4ac45f03..6a334ddf4f 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -897,6 +897,7 @@ class story extends control $storyID = (int)$storyID; $story = $this->story->getById($storyID, $version, true); if(!$story) die(js::error($this->lang->notFound) . js::locate('back')); + if(!empty($story->lib)) die(js::locate($this->createLink('assetlib', 'storyView', "storyID=$storyID"), 'window.parent.$.apps.open')); $story = $this->story->mergeReviewer($story, true);