Merge pull request #1962 from plone/issue_1472

Show version of products in Add-ons control panel configlet
plone · Mar 8, 2017 · c5e6034 · c5e6034
2 parents 3e68e58 + ad146f9
commit c5e6034
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -20,6 +20,10 @@ New features:
 
 Bug fixes:
 
+- Show version of products in Add-ons control panel configlet.
+  This fixes https://github.com/plone/Products.CMFPlone/issues/1472.
+  [hvelarde]
+
 - Resource registry legacy bundle cooking: Exit early with a warning, if preconditions to build are not given (no compilation paths).
   Allow cooking CSS, even if no JS is defined.
   Log all important steps of the cooking process.

diff --git a/Products/CMFPlone/controlpanel/browser/quickinstaller.pt b/Products/CMFPlone/controlpanel/browser/quickinstaller.pt
@@ -64,7 +64,7 @@
                 </h3>
                 <p class="configletDescription discreet">
                   <tal:span tal:condition="product/description" tal:content="product/description" i18n:translate="">add-on description</tal:span>
-                  <em class="discreet"> – (<tal:span tal:content="string:${pid}"> plugin.app.name </tal:span>)</em>
+                  <em class="discreet"> – (<span tal:replace="pid">plugin.app.name</span> <span tal:replace="product/version">1.0</span>)</em>
                 </p>
                 <ul class="configletDetails">
                   <li tal:define="upgrade_info product/upgrade_info">
@@ -144,7 +144,7 @@
                   <tal:span tal:condition="product/description"
                     i18n:translate=""
                     tal:content="product/description">add-on description</tal:span>
-                  <em class="discreet"> – (<tal:span tal:content="string:${pid}"> plugin.app.name </tal:span>)</em>
+                  <em class="discreet"> – (<span tal:replace="pid">plugin.app.name</span> <span tal:replace="product/version">1.0</span>)</em>
                 </p>
                 <dl class="portalMessage warning"
                    tal:condition="not:product/uninstall_profile">
@@ -185,7 +185,7 @@
                       <tal:span tal:condition="product/description"
                         i18n:translate=""
                         tal:content="product/description">add-on description</tal:span>
-                      <em class="discreet"> – (<tal:span tal:content="string:${pid}"> plugin.app.name </tal:span>)</em>
+                      <em class="discreet"> – (<span tal:replace="pid">plugin.app.name</span> <span tal:replace="product/version">1.0</span>)</em>
                     </p>
                     <dl class="portalMessage info"
                         tal:condition="not:product/uninstall_profile">

diff --git a/Products/CMFPlone/controlpanel/browser/quickinstaller.py b/Products/CMFPlone/controlpanel/browser/quickinstaller.py
@@ -556,6 +556,7 @@ def marshall_addons(self):
                     continue
                 addons[product_id] = {
                     'id': product_id,
+                    'version': self.get_product_version(product_id),
                     'title': product_id,
                     'description': '',
                     'upgrade_profiles': {},