diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2013-09-19 04:58:08 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2013-09-19 04:58:08 +0400 |
| commit | a4bdeb271e5099241138b47f00350e29033b9ebc (patch) | |
| tree | 3e777dc730d8104cdd1132fa52c7363e5b31b7e1 | |
| parent | 55abb2693c886a08de1a092f7714017471ff211e (diff) | |
display success message after activating
| -rw-r--r-- | plugins/CorePluginsAdmin/Controller.php | 22 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/templates/plugins.twig | 4 | ||||
| -rw-r--r-- | plugins/CorePluginsAdmin/templates/themes.twig | 4 |
3 files changed, 28 insertions, 2 deletions
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 3efdb4bf20..55b8401060 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -192,8 +192,16 @@ class Controller extends \Piwik\Controller\Admin function plugins() { + $activated = Common::getRequestVar('activated', false, 'integer', $_GET); + $pluginName = Common::getRequestVar('pluginName', '', 'string'); + $view = $this->configureView('@CorePluginsAdmin/plugins'); + $view->activatedPluginName = ''; + if ($activated && $pluginName) { + $view->activatedPluginName = $pluginName; + } + $view->updateNonce = Nonce::getNonce('CorePluginsAdmin.updatePlugin'); $view->activateNonce = Nonce::getNonce('CorePluginsAdmin.activatePlugin'); $view->pluginsInfo = $this->getPluginsInfo(); @@ -205,8 +213,16 @@ class Controller extends \Piwik\Controller\Admin function themes() { + $activated = Common::getRequestVar('activated', false, 'integer', $_GET); + $pluginName = Common::getRequestVar('pluginName', '', 'string'); + $view = $this->configureView('@CorePluginsAdmin/themes'); + $view->activatedPluginName = ''; + if ($activated && $pluginName) { + $view->activatedPluginName = $pluginName; + } + $pluginsInfo = $this->getPluginsInfo($themesOnly = true); $view->updateNonce = Nonce::getNonce('CorePluginsAdmin.updatePlugin'); @@ -309,11 +325,13 @@ class Controller extends \Piwik\Controller\Admin \Piwik\PluginsManager::getInstance()->activatePlugin($pluginName); if ($redirectAfter) { + $params = array('activated' => 1, 'pluginName' => $pluginName); $plugin = PluginsManager::getInstance()->loadPlugin($pluginName); + if ($plugin->isTheme()) { - $this->redirectToIndex('CorePluginsAdmin', 'themes', null, null, null, array('activated' => 1)); + $this->redirectToIndex('CorePluginsAdmin', 'themes', null, null, null, $params); } else { - $this->redirectToIndex('CorePluginsAdmin', 'plugins', null, null, null, array('activated' => 1)); + $this->redirectToIndex('CorePluginsAdmin', 'plugins', null, null, null, $params); } } } diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig index 075f59c361..7b6887e915 100644 --- a/plugins/CorePluginsAdmin/templates/plugins.twig +++ b/plugins/CorePluginsAdmin/templates/plugins.twig @@ -5,6 +5,10 @@ {% block content %} <div style="max-width:980px;"> + {% if activatedPluginName %} + <div id="feedback-success">You have successfully activated plugin {{ activatedPluginName }}</div> + {% endif %} + {% if pluginsHavingUpdate|length %} <h2>{{ pluginsHavingUpdate|length }} Update(s) available</h2> diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig index 6c90204202..b364c0fabf 100644 --- a/plugins/CorePluginsAdmin/templates/themes.twig +++ b/plugins/CorePluginsAdmin/templates/themes.twig @@ -5,6 +5,10 @@ {% block content %} <div style="max-width:980px;"> + {% if activatedPluginName %} + <div id="feedback-success">You have successfully activated plugin {{ activatedPluginName }}</div> + {% endif %} + {% if pluginsHavingUpdate|length %} <h2>{{ pluginsHavingUpdate|length }} Update(s) available</h2> |