Skip to content

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

slapos_panel: 

* project does not have status gadget anymore
* use getPreferredHateoasUrl to generate the compute token
  improve consistency with slaptool (configure this value in 1 place only)
parent eab88e82
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 251 deletions
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ProjectModule_viewProjectListOnSlaposPanel.xml
View file @ 97b688e6
......@@ -96,9 +96,7 @@
<item>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_status</string>
</list>
<list/>
</value>
</item>
<item>
......
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ProjectModule_viewProjectListOnSlaposPanel/listbox.xml
View file @ 97b688e6
......@@ -120,10 +120,6 @@
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>status</string>
<string>Status</string>
</tuple>
</list>
</value>
</item>
......
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ProjectModule_viewProjectListOnSlaposPanel/listbox_status.xml deleted 100644 → 0
View file @ eab88e82
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>gadget_url</string>
<string>renderjs_extra</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_status</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>gadget_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>renderjs_extra</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_gadget_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>gadget_url</string> </key>
<value> <string>gadget_slapos_status.html</string> </value>
</item>
<item>
<key> <string>renderjs_extra</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Status</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [(\'portal_type\', cell.getPortalType()), (\'jio_key\', cell.getRelativeUrl()), (\'result\', cell.Project_getNewsDict())]</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_addSlapOSComputeNodeToken.py
View file @ 97b688e6
......@@ -15,9 +15,13 @@ if slapos_master_api is None:
# This url is only used to call 1 (one) python script.
# it could be whatever url able to reach erp5
slapos_master_web_url = web_site.getLayoutProperty(
"configuration_slapos_master_web_url",
default=web_site.absolute_url()
slapos_master_web_url = portal.portal_preferences.getPreferredHateoasUrl(None)
if slapos_master_web_url is None:
return context.Base_redirect(
keep_items={
'portal_status_message': 'slapos_master_web_url is not configured',
'portal_status_level': 'error'
}
)
# XXX this url is HARDCODED on the client side
......
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_viewOnSlaposPanel.xml
View file @ 97b688e6
......@@ -114,9 +114,7 @@
<item>
<key> <string>right</string> </key>
<value>
<list>
<string>my_status</string>
</list>
<list/>
</value>
</item>
</dictionary>
......
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/Project_viewOnSlaposPanel/my_status.xml deleted 100644 → 0
View file @ eab88e82
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>gadget_url</string>
<string>renderjs_extra</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_status</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>renderjs_extra</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_gadget_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>gadget_url</string> </key>
<value> <string>gadget_slapos_status.html</string> </value>
</item>
<item>
<key> <string>renderjs_extra</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Monitoring Status</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [(\'jio_key\', context.getRelativeUrl()), (\'result\', context.Project_getNewsDict())]</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
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