Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_workflow
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wenjie.zheng
erp5_workflow
Commits
1fc0d30f
Commit
1fc0d30f
authored
Oct 03, 2014
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Directly edit newly created document.
parent
959bb40e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
13 deletions
+33
-13
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_js.xml
...i/PathTemplateItem/web_page_module/rjs_gadget_erp5_js.xml
+10
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
...tem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
+15
-5
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
...eItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
+3
-3
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml
..._page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml
+1
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_formpage_js.xml
...teItem/web_page_module/rjs_gadget_erp5_pt_formpage_js.xml
+4
-3
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_js.xml
View file @
1fc0d30f
...
...
@@ -257,7 +257,16 @@
\n
.allowPublicAcquisition("whoWantToDisplayThis", function (param_list) {\n
// Hey, I want to display some URL\n
return this.aq_pleasePublishMyState({jio_key: param_list[0], view: this.props.default_view_reference});\n
var options = {\n
jio_key: param_list[0],\n
view: this.props.default_view_reference\n
};\n
if (param_list[1] !== undefined) {\n
if (param_list[1].editable !== undefined) {\n
options.editable = param_list[1].editable;\n
}\n
}\n
return this.aq_pleasePublishMyState(options);\n
})\n
.allowPublicAcquisition("whoWantToDisplayThisPage", function (param_list) {\n
// Hey, I want to display some URL\n
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
View file @
1fc0d30f
...
...
@@ -137,6 +137,9 @@
.declareAcquiredMethod("whoWantToDisplayThisPage", "whoWantToDisplayThisPage")\n
.declareAcquiredMethod("whoWantToDisplayThis", "whoWantToDisplayThis")\n
.declareAcquiredMethod("renderPageHeader", "renderPageHeader")\n
.declareAcquiredMethod("notifySubmitting", "notifySubmitting")\n
.declareAcquiredMethod("notifySubmitted", "notifySubmitted")\n
\n
\n
/////////////////////////////////////////////////////////////////\n
// declared methods\n
...
...
@@ -151,6 +154,7 @@
\n
form_gadget.props.id = erp5_document._id;\n
form_gadget.props.view = options.view;\n
form_gadget.props.editable = options.editable;\n
form_gadget.props.action = erp5_document._embedded._view._actions.put;\n
form_gadget.props.form_id = erp5_document._embedded._view.form_id;\n
\n
...
...
@@ -194,7 +198,10 @@
var form_gadget = this;\n
\n
function formSubmit() {\n
return form_gadget.getDeclaredGadget("erp5_form")\n
return form_gadget.notifySubmitting()\n
.push(function () {\n
return form_gadget.getDeclaredGadget("erp5_form");\n
})\n
.push(function (erp5_form) {\n
return erp5_form.getContent();\n
})\n
...
...
@@ -228,10 +235,13 @@
// No redirection, stay on the same document\n
return form_gadget.whoWantToDisplayThisPage({name: "view"});\n
}\n
return form_gadget.whoWantToDisplayThis(new URI(location).segment(2));\n
return form_gadget.whoWantToDisplayThis(new URI(location).segment(2)
, {editable: form_gadget.props.editable}
);\n
})\n
.push(function (url) {\n
return form_gadget.pleaseRedirectMyHash(url);\n
return RSVP.all([\n
form_gadget.notifySubmitted(),\n
form_gadget.pleaseRedirectMyHash(url)\n
]);\n
});\n
}\n
\n
...
...
@@ -381,7 +391,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
937.6
4201.40983.399
3
</string>
</value>
<value>
<string>
937.6
5475.63762.4012
3
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -399,7 +409,7 @@
</tuple>
<state>
<tuple>
<float>
1412
251248.98
</float>
<float>
1412
328524.22
</float>
<string>
GMT
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
View file @
1fc0d30f
...
...
@@ -133,7 +133,7 @@
.push(function () {\n
var new_content_action = options.erp5_document._links.action_object_new_content_action;\n
if (new_content_action !== undefined) {\n
new_content_action = gadget.whoWantToDisplayThisPage({name: new_content_action.name});\n
new_content_action = gadget.whoWantToDisplayThisPage({name: new_content_action.name
, editable: true
});\n
} else {\n
new_content_action = "";\n
}\n
...
...
@@ -300,7 +300,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
937.64
086.34377.7560
</string>
</value>
<value>
<string>
937.64
343.1806.54016
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -318,7 +318,7 @@
</tuple>
<state>
<tuple>
<float>
1412
257173.84
</float>
<float>
1412
327028.09
</float>
<string>
GMT
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml
View file @
1fc0d30f
...
...
@@ -159,7 +159,7 @@
\n
new_content_action = options.erp5_document._links.action_object_new_content_action;\n
if (new_content_action !== undefined) {\n
new_content_action = form_gadget.whoWantToDisplayThisPage({name: new_content_action.name});\n
new_content_action = form_gadget.whoWantToDisplayThisPage({name: new_content_action.name
, editable: true
});\n
} else {\n
new_content_action = "";\n
}\n
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_formpage_js.xml
View file @
1fc0d30f
...
...
@@ -136,7 +136,7 @@
return this.getDeclaredGadget(\'fg\')\n
.push(function (g) {\n
return g.triggerSubmit();\n
})\n
})
;
\n
})\n
.declareMethod("render", function (options) {\n
var gadget = this,\n
...
...
@@ -172,6 +172,7 @@
sub_options.view = options.view;\n
sub_options.action_view = options.action_view;\n
sub_options.jio_key = options.jio_key;\n
sub_options.editable = options.editable;\n
\n
form_gadget = result;\n
return form_gadget.render(sub_options);\n
...
...
@@ -325,7 +326,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
937.
58335.7310.1747
6
</string>
</value>
<value>
<string>
937.
65478.52910.5005
6
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -343,7 +344,7 @@
</tuple>
<state>
<tuple>
<float>
1412
239088.85
</float>
<float>
1412
344031.82
</float>
<string>
GMT
</string>
</tuple>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment