Skip to content

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

slapos_jio: Remove WebMessage_stop call and don't set unnecessary values 

The call to web_message stop was replaced by an interaction workflow entry along with the dummy sets with values hardcoded on the UI.

In general, UI should be cleaned up to contain its minimal necessary for API and all the deeper logic should be implemented exclusively on the backend.
parent 3848710a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 144 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_add_related_event_js.js
View file @ bcf92d4e
...@@ -32,18 +32,11 @@ ...@@ -32,18 +32,11 @@
.push(function (doc) { .push(function (doc) {
return gadget.jio_post(doc); return gadget.jio_post(doc);
}) })
.push(function (key) {
return gadget.getSetting('hateoas_url')
.push(function (hateoas_url) {
return gadget.jio_putAttachment(key,
hateoas_url + key + "/WebMessage_stop", {});
})
.push(function () { .push(function () {
return gadget.redirect({"command": "change", return gadget.redirect({"command": "change",
"options": {"jio_key": gadget.state.jio_key, "options": {"jio_key": gadget.state.jio_key,
"page": "slap_controller"}}); "page": "slap_controller"}});
}); });
});
}) })
.declareMethod("triggerSubmit", function () { .declareMethod("triggerSubmit", function () {
...@@ -77,28 +70,6 @@ ...@@ -77,28 +70,6 @@
"hidden": 1, "hidden": 1,
"type": "StringField" "type": "StringField"
}, },
"my_resource": {
"description": "Resource",
"title": "Title",
"default": result[2].resource,
"css_class": "",
"required": 1,
"editable": 1,
"key": "resource",
"hidden": 1,
"type": "StringField"
},
"my_destination": {
"description": "",
"title": "Source",
"default": result[2].source,
"css_class": "",
"required": 1,
"editable": 1,
"key": "destination",
"hidden": 1,
"type": "StringField"
},
"my_text_content": { "my_text_content": {
"description": "Include your message", "description": "Include your message",
"title": "Your Message", "title": "Your Message",
...@@ -121,17 +92,6 @@ ...@@ -121,17 +92,6 @@
"hidden": 1, "hidden": 1,
"type": "StringField" "type": "StringField"
}, },
"my_content_type": {
"description": "",
"title": "Content Type",
"default": "plain/text",
"css_class": "",
"required": 1,
"editable": 1,
"key": "content_type",
"hidden": 1,
"type": "StringField"
},
"my_follow_up": { "my_follow_up": {
"description": "", "description": "",
"title": "Follow up", "title": "Follow up",
...@@ -164,17 +124,6 @@ ...@@ -164,17 +124,6 @@
"key": "parent_relative_url", "key": "parent_relative_url",
"hidden": 1, "hidden": 1,
"type": "StringField" "type": "StringField"
},
"my_start_date": {
"description": "",
"title": "Start Date",
"default": (new Date()).toISOString(),
"css_class": "",
"required": 1,
"editable": 1,
"key": "start_date",
"hidden": 1,
"type": "StringField"
} }
}}, }},
"_links": { "_links": {
...@@ -189,9 +138,7 @@ ...@@ -189,9 +138,7 @@
"center", "center",
[["my_title"], ["my_text_content"], ["my_follow_up"], [["my_title"], ["my_text_content"], ["my_follow_up"],
["my_portal_type"], ["my_parent_relative_url"], ["my_portal_type"], ["my_parent_relative_url"],
["my_follow_up"], ["my_source"], ["my_resource"], ["my_follow_up"], ["my_source"]]
["my_content_type"], ["my_destination"],
["my_start_date"]]
]] ]]
} }
}); });
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_add_related_event_js.xml
View file @ bcf92d4e
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>971.61017.55148.37802</string> </value> <value> <string>972.37270.25301.10137</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1543420431.94</float> <float>1545841502.46</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/WebMessage_stop.py deleted 100644 → 0
View file @ 3848710a
from zExceptions import Unauthorized
portal = context.getPortalObject()
person = portal.ERP5Site_getAuthenticatedMemberPersonValue()
# XXX Proxy role is Manager so user to open ticket which is closed.
# We check permissions
if not person:
raise Unauthorized("You need to be logged in before modify this object!")
ticket = context.getFollowUpValue()
if ticket.getDestinationDecision() != person.getRelativeUrl():
raise Unauthorized
context.stop(comment="Submitted from the renderjs app")
if portal.portal_workflow.isTransitionPossible(ticket, "validate"):
ticket.validate(comment="See %s" % context.getRelativeUrl())
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/WebMessage_stop.xml deleted 100644 → 0
View file @ 3848710a
<?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>*args, **kwargs</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>WebMessage_stop</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