Skip to content

S
slapos.core
Commit f5b96752 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

slapos_slap_tool: add compatibility with old clients 

Old slapgrid version will use the "Hosting Subscription" term during
search.
Add a new Skin Selection to rewrite the search query on the fly.

Add a new web site to not rely on the generic one, as it prevent specific customization
parent d2c30daf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1221 additions and 3 deletions
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
View file @ f5b96752
......@@ -45,6 +45,7 @@ class TestSlaposSkinSelectionMixin(SlapOSTestCaseMixin):
'RedirectAssist',
'SHACACHE',
'SHADIR',
'SlapOSHalRestricted',
'SlideShow',
'View'
]
......@@ -1492,6 +1493,119 @@ erp5_workflow
external_method
slapos_disaster_recovery
Images
"""
slapos_hal_restricted_selection_string_list = \
"""
custom
erp5_font
slapos_hal_json_restricted_compatibility_style
erp5_hal_json_restricted_style
erp5_hal_json_style
erp5_web_hal_json
slapos_ecoallocation
slapos_erp5
slapos_upgrader
slapos_base
slapos_contract
slapos_subscription_request
slapos_crm_monitoring
slapos_accounting
slapos_administration
slapos_cloud
slapos_consumption
slapos_core
slapos_crm
slapos_payzen
slapos_pdm
slapos_simulation
slapos_slap_tool
slapos_wechat
slapos_configurator
erp5_km
erp5_knowledge_pad
erp5_simulation
erp5_dms_base
erp5_dms_web
erp5_accounting_l10n_fr
erp5_certificate_authority
erp5_item
erp5_item_trade
erp5_upgrader
erp5_access_tab
erp5_access_token
erp5_accounting
erp5_accounting_eu
erp5_accounting_fr
erp5_administration
erp5_authentication_policy
erp5_auto_logout
erp5_base
erp5_bearer_token
erp5_ckeditor
erp5_code_mirror
erp5_commerce
erp5_commerce_widget_library
erp5_computer_immobilisation
erp5_configurator
erp5_configurator_wizard
erp5_content_translation
erp5_core
erp5_core_proxy_field_legacy
erp5_credential
erp5_credential_oauth2
erp5_crm
erp5_data_set
erp5_deferred_style_core
erp5_dhtml_style
erp5_diff
erp5_dms
erp5_fckeditor
erp5_forge
erp5_forge_release
erp5_gadget
erp5_glossary
erp5_immobilisation
erp5_ingestion
erp5_integration
erp5_invoicing
erp5_jquery_sheet_editor
erp5_monaco_editor
erp5_oauth
erp5_oauth_facebook_login
erp5_oauth_google_login
erp5_ods_core
erp5_odt_core
erp5_ooo_import
erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm
erp5_project
erp5_project_trade
erp5_rss_core
erp5_run_my_doc
erp5_secure_payment
erp5_simplified_invoicing
erp5_slideshow_core
erp5_software_pdm
erp5_svg_editor
erp5_syncml
erp5_system_event
erp5_toolbox
erp5_trade
erp5_vcs
erp5_web
erp5_web_crm
erp5_web_minimal_theme
erp5_web_renderjs
erp5_web_service
erp5_web_widget_library
erp5_wechat_secure_payment
erp5_workflow
erp5_xhtml_style
external_method
slapos_disaster_recovery
Images
"""
def getTitle(self):
......@@ -1600,7 +1714,9 @@ Images
self.assertSameSkinSelection("RJS",
self.rjs_selection_string_list)
def _test_19_SlapOSHalRestricted_selection(self):
self.assertSameSkinSelection("SlapOSHalRestricted",
self.slapos_hal_restricted_selection_string_list)
class TestSlaposSkinSelection(TestSlaposSkinSelectionMixin):
......@@ -1619,3 +1735,4 @@ class TestSlaposSkinSelection(TestSlaposSkinSelectionMixin):
test_16_SHACACHE_selection = TestSlaposSkinSelectionMixin._test_16_SHACACHE_selection
test_17_SHADIR_selection = TestSlaposSkinSelectionMixin._test_17_SHADIR_selection
test_18_RJS_selection = TestSlaposSkinSelectionMixin._test_18_RJS_selection
test_19_SlapOSHalRestricted_selection = TestSlaposSkinSelectionMixin._test_19_SlapOSHalRestricted_selection
master/bt5/slapos_slap_tool/PathTemplateItem/web_site_module/slapos_hateoas/connection.xml 0 → 100644
View file @ f5b96752
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Section" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>__before_publishing_traverse__</string> </key>
<value>
<object>
<klass>
<global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_defined_in_class</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>_hookname</string> </key>
<value> <string>__before_publishing_traverse__</string> </value>
</item>
<item>
<key> <string>_list</string> </key>
<value>
<list>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</list>
</value>
</item>
<item>
<key> <string>_prior</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>__before_traverse__</string> </key>
<value>
<dictionary>
<item>
<key>
<tuple>
<int>99</int>
<string>ERP5 Web Section/connection</string>
</tuple>
</key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>caching_policy/no-cache</string>
</tuple>
</value>
</item>
<item>
<key> <string>container_layout</string> </key>
<value> <string>WebSection_renderDefaultPageAsGadget</string> </value>
</item>
<item>
<key> <string>content_layout</string> </key>
<value> <string>WebSection_renderDefaultPageAsGadget</string> </value>
</item>
<item>
<key> <string>custom_render_method_id</string> </key>
<value> <string>WebSection_renderDefaultPageAsGadget</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>empty_criterion_valid</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>connection</string> </value>
</item>
<item>
<key> <string>layout_configuration_form_id</string> </key>
<value> <string>WebSection_viewRenderJSPreference</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Section</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>skin_selection_name</string> </key>
<value> <string>RJS</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Connection</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
</pickle>
<pickle>
<dictionary/>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_slap_tool/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml 0 → 100644
View file @ f5b96752
<registered_skin_selection>
<skin_folder_selection>
<skin_folder>erp5_hal_json_restricted_style</skin_folder>
<skin_selection>SlapOSHalRestricted</skin_selection>
</skin_folder_selection>
<skin_folder_selection>
<skin_folder>erp5_hal_json_style</skin_folder>
<skin_selection>SlapOSHalRestricted</skin_selection>
</skin_folder_selection>
<skin_folder_selection>
<skin_folder>erp5_xhtml_style</skin_folder>
<skin_selection>SlapOSHalRestricted</skin_selection>
</skin_folder_selection>
<skin_folder_selection>
<skin_folder>slapos_hal_json_restricted_compatibility_style</skin_folder>
<skin_selection>SlapOSHalRestricted</skin_selection>
</skin_folder_selection>
</registered_skin_selection>
\ No newline at end of file
master/bt5/slapos_slap_tool/SkinTemplateItem/portal_skins/slapos_hal_json_restricted_compatibility_style.xml 0 → 100644
View file @ f5b96752
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Folder" module="OFS.Folder"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>business_template_skin_layer_priority</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>float</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>business_template_skin_layer_priority</string> </key>
<value> <float>100.0</float> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>slapos_hal_json_restricted_compatibility_style</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_slap_tool/SkinTemplateItem/portal_skins/slapos_hal_json_restricted_compatibility_style/ERP5Document_getHateoas.py 0 → 100644
View file @ f5b96752
portal = context.getPortalObject()
if (mode == 'search') and (query is not None):
# Rewrite the queries containing the Hosting Subscription string
query = query.replace('"Hosting Subscription"', '"Instance Tree"')
new_skin_name = "HalRestricted"
portal.portal_skins.changeSkin(new_skin_name)
if REQUEST is None:
REQUEST = context.REQUEST
REQUEST.set('portal_skin', new_skin_name)
return context.ERP5Document_getHateoas(
REQUEST=REQUEST,
response=response,
view=view,
mode=mode,
query=query,
select_list=select_list,
limit=limit,
form=form,
form_data=form_data,
relative_url=relative_url,
list_method=list_method,
default_param_json=default_param_json,
form_relative_url=form_relative_url,
bulk_list=bulk_list,
group_by=group_by,
sort_on=sort_on,
local_roles=local_roles,
selection_domain=selection_domain,
extra_param_json=extra_param_json,
portal_status_message=portal_status_message,
portal_status_level=portal_status_level,
keep_items=keep_items
)
master/bt5/slapos_slap_tool/SkinTemplateItem/portal_skins/slapos_hal_json_restricted_compatibility_style/ERP5Document_getHateoas.xml 0 → 100644
View file @ f5b96752
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<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>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>REQUEST=None, response=None, view=None, mode=\'root\', query=None, select_list=None, limit=10, local_roles=None, form=None, form_data=None, relative_url=None, list_method=None, default_param_json=None, form_relative_url=None, bulk_list="[]", group_by=None, sort_on=None, selection_domain=None, extra_param_json=None, portal_status_message=\'\', portal_status_level=None, keep_items=None</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ERP5Document_getHateoas</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_slap_tool/TestTemplateItem/portal_components/test.erp5.testSlapOSHalRestrictedCompatibilityJsonStyle.py 0 → 100644
View file @ f5b96752
from erp5.component.test.testHalJsonStyle import ERP5HALJSONStyleSkinsMixin, simulate, changeSkin, do_fake_request
import json
class TestSlapOSHalRestrictedCompatibility(ERP5HALJSONStyleSkinsMixin):
def getHatoasWebSite(self):
return self.portal.web_site_module.slapos_hateoas
@simulate('Base_getRequestUrl', '*args, **kwargs',
'return "http://example.org/bar"')
@simulate('Base_getRequestHeader', '*args, **kwargs',
'return "application/hal+json"')
@changeSkin('SlapOSHalRestricted')
def test_restricted_mode_search(self):
fake_request = do_fake_request("GET")
self.logout()
self.getHatoasWebSite().ERP5Document_getHateoas(REQUEST=fake_request, mode="search")
self.assertEquals(fake_request.RESPONSE.status, 401)
self.assertEquals(fake_request.RESPONSE.getHeader('WWW-Authenticate'),
'X-Delegate uri="%s/connection/login_form{?came_from}"' % self.getHatoasWebSite().absolute_url()
)
@simulate('Base_getRequestUrl', '*args, **kwargs',
'return "http://example.org/bar"')
@simulate('Base_getRequestHeader', '*args, **kwargs',
'return "application/hal+json"')
@changeSkin('SlapOSHalRestricted')
def test_mode_search_rewrite_hosting_subscription(self):
fake_request = do_fake_request("GET")
result = self.getHatoasWebSite().ERP5Document_getHateoas(
REQUEST=fake_request,
mode="search",
query='portal_type: "Hosting Subscription"'
)
self.assertEquals(fake_request.RESPONSE.status, 200)
self.assertEquals(fake_request.RESPONSE.getHeader('Content-Type'),
"application/hal+json"
)
result_dict = json.loads(result)
self.assertEqual(result_dict['_query'].encode(),
'portal_type: "Instance Tree"')
\ No newline at end of file
master/bt5/slapos_slap_tool/TestTemplateItem/portal_components/test.erp5.testSlapOSHalRestrictedCompatibilityJsonStyle.xml 0 → 100644
View file @ f5b96752
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Test Component" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testSlapOSHalRestrictedCompatibilityJsonStyle</string> </value>
</item>
<item>
<key> <string>default_source_reference</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testSlapOSHalRestrictedCompatibilityJsonStyle</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Test Component</string> </value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_log</string> </key>
<value>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_slap_tool/bt/dependency_list
View file @ f5b96752
slapos_cloud
erp5_hal_json_style
slapos_accounting
\ No newline at end of file
master/bt5/slapos_slap_tool/bt/template_keep_last_workflow_history_only_path_list 0 → 100644
View file @ f5b96752
web_site_module/slapos_hateoas
\ No newline at end of file
master/bt5/slapos_slap_tool/bt/template_keep_workflow_path_list 0 → 100644
View file @ f5b96752
web_site_module/slapos_hateoas
\ No newline at end of file
master/bt5/slapos_slap_tool/bt/template_path_list
View file @ f5b96752
......@@ -3,4 +3,6 @@ portal_caches/computer_information_cache_factory/persistent_cache_plugin
portal_caches/last_stored_data_cache_factory
portal_caches/last_stored_data_cache_factory/volatile_cache_plugin
portal_caches/slap_cache_factory
portal_caches/slap_cache_factory/persistent_cache_plugin
\ No newline at end of file
portal_caches/slap_cache_factory/persistent_cache_plugin
web_site_module/slapos_hateoas
web_site_module/slapos_hateoas/**
\ No newline at end of file
master/bt5/slapos_slap_tool/bt/template_registered_skin_selection_list 0 → 100644
View file @ f5b96752
erp5_hal_json_restricted_style | SlapOSHalRestricted
erp5_hal_json_style | SlapOSHalRestricted
erp5_xhtml_style | SlapOSHalRestricted
slapos_hal_json_restricted_compatibility_style | SlapOSHalRestricted
\ No newline at end of file
master/bt5/slapos_slap_tool/bt/template_skin_id_list
View file @ f5b96752
slapos_hal_json_restricted_compatibility_style
slapos_slap_tool
\ No newline at end of file
master/bt5/slapos_slap_tool/bt/template_test_id_list
View file @ f5b96752
test.erp5.testSlapOSSlapToolComputerUpdateFromDict
test.erp5.testSlapOSSlapTool
\ No newline at end of file
test.erp5.testSlapOSSlapTool
test.erp5.testSlapOSHalRestrictedCompatibilityJsonStyle
\ No newline at end of file
master/bt5/slapos_slap_tool/bt/test_dependency_list 0 → 100644
View file @ f5b96752
erp5_full_text_mroonga_catalog
erp5_ui_test_core
erp5_ui_test
\ 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