diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2013-09-21 07:34:41 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2013-09-21 07:34:41 +0400 |
commit | 435ebca655fdee528ed799d17330c53b5d9cf551 (patch) | |
tree | 12465676008ffb6f69e1a796aecbb0b61e0e8990 /plugins | |
parent | dd2179f48a67991b7f1fc25835ad5e5a58b26a64 (diff) |
refs #4053 display a possible error when displaying plugin detail
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/CorePluginsAdmin/Controller.php | 10 | ||||
-rwxr-xr-x | plugins/CorePluginsAdmin/javascripts/pluginDetail.js | 4 | ||||
-rw-r--r-- | plugins/CorePluginsAdmin/templates/pluginDetails.twig | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 2735b6c9be..4ddf05e4e8 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -87,15 +87,21 @@ class Controller extends \Piwik\Controller\Admin public function pluginDetails() { $pluginName = Common::getRequestVar('pluginName', '', 'string'); + $pluginName = strip_tags($pluginName); if (empty($pluginName)) { return; } $view = $this->configureView('@CorePluginsAdmin/pluginDetails'); + $view->errorMessage = ''; - $marketplace = new MarketplaceApiClient(); - $view->plugin = $marketplace->getPluginInfo($pluginName); + try { + $marketplace = new MarketplaceApiClient(); + $view->plugin = $marketplace->getPluginInfo($pluginName); + } catch (\Exception $e) { + $view->errorMessage = $e->getMessage(); + } echo $view->render(); } diff --git a/plugins/CorePluginsAdmin/javascripts/pluginDetail.js b/plugins/CorePluginsAdmin/javascripts/pluginDetail.js index df5fe0a586..dfdcc57965 100755 --- a/plugins/CorePluginsAdmin/javascripts/pluginDetail.js +++ b/plugins/CorePluginsAdmin/javascripts/pluginDetail.js @@ -65,8 +65,8 @@ $(document).ready(function () { }); var showPopover = function (pluginName) { - var url = 'module=CorePluginsAdmin&action=pluginDetails&pluginName=' + pluginName; - Piwik_Popover.createPopupAndLoadUrl(url, 'theme details'); + var url = 'module=CorePluginsAdmin&action=pluginDetails&pluginName=' + encodeURIComponent(pluginName); + Piwik_Popover.createPopupAndLoadUrl(url, 'details'); }; broadcast.addPopoverHandler('browsePluginDetail', showPopover); diff --git a/plugins/CorePluginsAdmin/templates/pluginDetails.twig b/plugins/CorePluginsAdmin/templates/pluginDetails.twig index 0e77b13d62..ffb80299e5 100644 --- a/plugins/CorePluginsAdmin/templates/pluginDetails.twig +++ b/plugins/CorePluginsAdmin/templates/pluginDetails.twig @@ -3,8 +3,11 @@ <div style="max-width:980px;"> - {{ plugin.detailPageHtml|raw }} - + {% if errorMessage %} + {{ errorMessage }} + {% elseif plugin %} + {{ plugin.detailPageHtml|raw }} + {% endif %} </div> {% endblock %} |