Skip to content

erp5
erp5
Commit e2af00b1 authored by Romain Courteaud's avatar Romain Courteaud Committed by Cédric Le Ninivin
Browse files
Options

[erp5_officejs_appstore_base] Stop hardcoding the appstore URL 

Set the wildcard URL on a system preference.
parent 264186f2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 921 additions and 4 deletions
bt5/erp5_officejs_appstore_base/ActionTemplateItem/portal_types/System%20Preference/appstore_preference.xml 0 → 100644
View file @ e2af00b1
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_view</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>appstore_preference</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>17.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Appstore</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/SystemPreference_viewAppstore</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_officejs_appstore_base/PropertySheetTemplateItem/portal_property_sheets/AppstoreSystemPreference.xml 0 → 100644
View file @ e2af00b1
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Property Sheet" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>AppstoreSystemPreference</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Property Sheet</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
bt5/erp5_officejs_appstore_base/PropertySheetTemplateItem/portal_property_sheets/AppstoreSystemPreference/preferred_system_appstore_wildcard_domain_property.xml 0 → 100644
View file @ e2af00b1
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>app.officejs.com</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_system_appstore_wildcard_domain_property</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>preference</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_officejs_appstore_base/PropertySheetTemplateItem/portal_property_sheets/AppstoreSystemPreference/preferred_system_appstore_wildcard_protocol_property.xml 0 → 100644
View file @ e2af00b1
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>http / https</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_system_appstore_wildcard_protocol_property</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>preference</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'https\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/Alarm_updateAppstoreWebSite.py
View file @ e2af00b1
import json import json
portal = context.getPortalObject() portal = context.getPortalObject()
preference_tool = portal.portal_preferences
software_product_list = portal.portal_catalog(portal_type='Software Product', validation_state='validated') software_product_list = portal.portal_catalog(portal_type='Software Product', validation_state='validated')
appstore_data = [] appstore_data = []
logo_url_list = [] logo_url_list = []
...@@ -29,7 +30,9 @@ for software_product in software_product_list: ...@@ -29,7 +30,9 @@ for software_product in software_product_list:
"application_published": 'some_date', "application_published": 'some_date',
"application_submitted": 'other_date', "application_submitted": 'other_date',
"application_description": data["description"] if "description" in data else data["name"], "application_description": data["description"] if "description" in data else data["name"],
"application_url": "https://%s.app.officejs.com/" % app_domain, "application_url": "%s://%s.%s/" % (preference_tool.getPreferredSystemAppstoreWildcardProtocol(),
app_domain,
preference_tool.getPreferredSystemAppstoreWildcardDomain()),
"application_title": data['short_name'], "application_title": data['short_name'],
"application_category": data['category'] if "category" in data else "Documents", "application_category": data['category'] if "category" in data else "Documents",
"application_title_i18n": "application.custom.%s.title" % app_domain, "application_title_i18n": "application.custom.%s.title" % app_domain,
......
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_getTestUrl.py
View file @ e2af00b1
...@@ -8,8 +8,12 @@ software_product = software_publication_line.getResourceValue(portal_type="Softw ...@@ -8,8 +8,12 @@ software_product = software_publication_line.getResourceValue(portal_type="Softw
if not software_product or not software_release or not software_product.getFollowUpId(portal_type="Web Section"): if not software_product or not software_release or not software_product.getFollowUpId(portal_type="Web Section"):
return return
# XXX Hardcoded portal = context.getPortalObject()
return "https://%s.app.officejs.com/%s/" % ( preference_tool = portal.portal_preferences
return "%s://%s.%s/%s/" % (
preference_tool.getPreferredSystemAppstoreWildcardProtocol(),
software_product.getFollowUpId(portal_type="Web Section"), software_product.getFollowUpId(portal_type="Web Section"),
preference_tool.getPreferredSystemAppstoreWildcardDomain(),
software_release.getReference(), software_release.getReference(),
) )
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SystemPreference_viewAppstore.xml 0 → 100644
View file @ e2af00b1
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ERP5 Form" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>Base_edit</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>my_preferred_system_appstore_wildcard_protocol</string>
<string>my_preferred_system_appstore_wildcard_domain</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SystemPreference_viewAppstore</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>SystemPreference_viewAppstore</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_view</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Appstore</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_officejs_appstore_base/bt/template_action_path_list
View file @ e2af00b1
...@@ -3,4 +3,5 @@ Software Product | application_version_list_view ...@@ -3,4 +3,5 @@ Software Product | application_version_list_view
Software Product | document_view Software Product | document_view
Software Product | update_application Software Product | update_application
Software Publication Module | create_sofware_publication_dialog Software Publication Module | create_sofware_publication_dialog
Software Release | document_view Software Release | document_view
\ No newline at end of file System Preference | appstore_preference
\ No newline at end of file
bt5/erp5_officejs_appstore_base/bt/template_property_sheet_id_list 0 → 100644
View file @ e2af00b1
AppstoreSystemPreference
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7