refs #4338 display link to open plugin in popover only if plugin exis…

…ts on marketplace
matomo-org · Nov 27, 2013 · eb8b174 · eb8b174
1 parent 6b3bd8e
commit eb8b174
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
@@ -223,9 +223,11 @@ private function createPluginsOrThemesView($template, $themesOnly)
 
         if (CorePluginsAdmin::isMarketplaceEnabled()) {
             $marketplace = new Marketplace();
-            $view->pluginsHavingUpdate = $marketplace->getPluginsHavingUpdate($themesOnly);
+            $view->marketplacePluginNames = $marketplace->getAvailablePluginNames($themesOnly);
+            $view->pluginsHavingUpdate    = $marketplace->getPluginsHavingUpdate($themesOnly);
         } else {
-            $view->pluginsHavingUpdate = array();
+            $view->pluginsHavingUpdate    = array();
+            $view->marketplacePluginNames = array();
         }
 
         return $view;

diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php
@@ -39,6 +39,22 @@ public function getPluginInfo($pluginName)
         return $plugin;
     }
 
+    public function getAvailablePluginNames($themesOnly)
+    {
+        if ($themesOnly) {
+            $plugins = $this->client->searchForThemes('', '', '');
+        } else {
+            $plugins = $this->client->searchForPlugins('', '', '');
+        }
+
+        $names = array();
+        foreach ($plugins as $plugin) {
+            $names[] = $plugin['name'];
+        }
+
+        return $names;
+    }
+
     public function searchPlugins($query, $sort, $themesOnly)
     {
         if ($themesOnly) {

diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -88,7 +88,7 @@
 
 {% endmacro %}
 
-{% macro tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, isTheme, isMarketplaceEnabled) %}
+{% macro tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, isTheme, marketplacePluginNames) %}
 
 <div id="confirmUninstallPlugin" class="ui-confirm">
 
@@ -114,12 +114,12 @@
             {% if (plugin.alwaysActivated is defined and not plugin.alwaysActivated) or isTheme %}
                 <tr {% if plugin.activated %}class="highlighted"{% endif %} data-filter-status="{% if plugin.activated %}active{% else %}inactive{% endif %}" data-filter-origin="{% if plugin.isCorePlugin %}core{% else %}noncore{% endif %}">
                     <td class="name">
-                        {% if plugin.isCorePlugin or plugin.info.version == 'Unknown'|translate or not isMarketplaceEnabled %}
-                            {{ name }}
-                        {% else %}
+                        {% if not plugin.isCorePlugin and name in marketplacePluginNames %}
                             <a href="javascript:false;" data-pluginName="{{ name|e('html_attr') }}">
                                 {{ name }}
                             </a>
+                        {% else %}
+                            {{ name }}
                         {% endif %}
 
                         {% if name in pluginNamesHavingSettings %}

diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig
@@ -10,7 +10,7 @@
 
         <p>{{ 'Update your plugins now to benefit from the latest improvements.'|translate }}</p>
 
-        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, activateNonce, 0, isMarketplaceEnabled) }}
+        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, activateNonce, 0) }}
     {% endif %}
 
     <h2>{{ 'CorePluginsAdmin_PluginsManagement'|translate }}</h2>
@@ -19,7 +19,7 @@
 
     {{ plugins.pluginsFilter(false, isMarketplaceEnabled) }}
 
-    {{ plugins.tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, false) }}
+    {{ plugins.tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, false, marketplacePluginNames) }}
 
 </div>
 {% endblock %}
diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig
@@ -10,7 +10,7 @@
 
         <p>{{ 'Update your themes to enjoy the latest version.'|translate }}</p>
 
-        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, true, isMarketplaceEnabled) }}
+        {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, true) }}
     {% endif %}
 
     <h2>{{ 'CorePluginsAdmin_ThemesManagement'|translate }}</h2>
@@ -23,7 +23,7 @@
 
     {{ plugins.pluginsFilter(true, isMarketplaceEnabled) }}
 
-    {{ plugins.tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, true) }}
+    {{ plugins.tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, true, marketplacePluginNames) }}
 
 </div>
 {% endblock %}