Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show version of products in Add-ons control panel configlet #1962

Merged
merged 1 commit into from
Mar 8, 2017
Merged

Show version of products in Add-ons control panel configlet #1962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions Products/CMFPlone/controlpanel/browser/quickinstaller.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions Products/CMFPlone/controlpanel/browser/quickinstaller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': {},
Expand Down