Skip to content

S
slapos.core
Commit 77322d78 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_jio: Allow set monitoring scope on hosting subscription

parent 98c3bf52
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 7 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_view_js.xml
View file @ 77322d78
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>969.62484.48542.9284</string> </value> <value> <string>971.7562.16184.25378</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1540213094.51</float> <float>1540214800.54</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.js
View file @ 77322d78
...@@ -137,6 +137,9 @@ ...@@ -137,6 +137,9 @@
['reference', 'Reference'], ['reference', 'Reference'],
['portal_type', 'Type'], ['portal_type', 'Type'],
['computer_monitoring_status', 'Status'] ['computer_monitoring_status', 'Status']
], monitor_scope_list = [['', ''],
['Enabled', 'enable'],
['Disabled', 'disable']
], ticket_column_list = [ ], ticket_column_list = [
['title', 'Title'], ['title', 'Title'],
['reference', 'Reference'], ['reference', 'Reference'],
...@@ -268,6 +271,18 @@ ...@@ -268,6 +271,18 @@
"hidden": gadget.state.doc.root_slave === 1, "hidden": gadget.state.doc.root_slave === 1,
"type": "GadgetField" "type": "GadgetField"
}, },
"my_monitor_scope": {
"description": "",
"title": "Monitoring",
"default": gadget.state.doc.monitor_scope,
"css_class": "",
"items": monitor_scope_list,
"required": 1,
"editable": 1,
"key": "monitor_scope",
"hidden": 0,
"type": "ListField"
},
"connection_listbox": { "connection_listbox": {
"column_list": connection_column_list, "column_list": connection_column_list,
"show_anchor": 0, "show_anchor": 0,
...@@ -340,11 +355,11 @@ ...@@ -340,11 +355,11 @@
form_definition: { form_definition: {
group_list: [[ group_list: [[
"left", "left",
[["my_title"], ["my_reference"],["my_short_title"], ["my_description"]] [["my_title"], ["my_reference"], ["my_short_title"], ["my_description"]]
], [ ], [
"right", "right",
[["my_slap_state_title"], ['my_monitoring_status']] [["my_slap_state_title"], ['my_monitoring_status'], ['my_monitor_scope']]
], ["center", ], ["center",
[["my_source_reference"], ["my_url_string"], ["my_text_content"]] [["my_source_reference"], ["my_url_string"], ["my_text_content"]]
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.xml
View file @ 77322d78
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>965.58216.33748.42820</string> </value> <value> <string>971.11856.29335.23364</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1519918943.19</float> <float>1540470762.22</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/HostingSubscription_edit.py
View file @ 77322d78
...@@ -2,6 +2,10 @@ request = context.REQUEST ...@@ -2,6 +2,10 @@ request = context.REQUEST
edit_kw = {} edit_kw = {}
if monitor_scope is not None and monitor_scope != context.getMonitorScope():
edit_kw["monitor_scope"] = monitor_scope
if short_title != context.getShortTitle(): if short_title != context.getShortTitle():
edit_kw["short_title"] = short_title edit_kw["short_title"] = short_title
......
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/HostingSubscription_edit.xml
View file @ 77322d78
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>text_content, short_title, description</string> </value> <value> <string>text_content, short_title, description, monitor_scope=None</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/HostingSubscription_viewAsHateoas.xml
View file @ 77322d78
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
<string>my_short_title</string> <string>my_short_title</string>
<string>my_description</string> <string>my_description</string>
<string>my_root_slave</string> <string>my_root_slave</string>
<string>my_monitor_scope</string>
</list> </list>
</value> </value>
</item> </item>
......
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/HostingSubscription_viewAsHateoas/my_monitor_scope.xml 0 → 100644
View file @ 77322d78
<?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>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_monitor_scope</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>
<item>
<key> <string>target</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>target</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_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Monitor Scope</string> </value>
</item>
</dictionary>
</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