Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
138
Merge Requests
138
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
1e3acb66
Commit
1e3acb66
authored
Nov 02, 2018
by
Yusei Tahara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bt5/erp5_simulation_fast_input: Fix the solve divergence dialog to make it work again.
parent
8e64fca3
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
763 additions
and
4 deletions
+763
-4
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_getSolveDivergenceDialogParameterFormBox.py
...nput/Delivery_getSolveDivergenceDialogParameterFormBox.py
+2
-2
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog.xml
...ulation_fast_input/Delivery_viewSolveDivergenceDialog.xml
+2
-0
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/gadget_solve_divergence_dialog.xml
...wSolveDivergenceDialog/gadget_solve_divergence_dialog.xml
+14
-0
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/listbox_solver.xml
...put/Delivery_viewSolveDivergenceDialog/listbox_solver.xml
+26
-1
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml
...iewSolveDivergenceDialog/listbox_solver_configuration.xml
+79
-0
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/your_dummy_html.xml
...ut/Delivery_viewSolveDivergenceDialog/your_dummy_html.xml
+296
-0
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/your_dummy_validator_field_for_gadget.xml
...ivergenceDialog/your_dummy_validator_field_for_gadget.xml
+272
-0
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/SolverDecision_render.py
...skins/erp5_simulation_fast_input/SolverDecision_render.py
+1
-0
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/SolverDecision_render.xml
...kins/erp5_simulation_fast_input/SolverDecision_render.xml
+70
-0
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/gadget_solve_divergence_dialog.js.js
...imulation_fast_input/gadget_solve_divergence_dialog.js.js
+1
-1
No files found.
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_getSolveDivergenceDialogParameterFormBox.py
View file @
1e3acb66
...
@@ -17,6 +17,6 @@ if solver:
...
@@ -17,6 +17,6 @@ if solver:
solver_decision
.
setSolverValue
(
solver_value
)
solver_decision
.
setSolverValue
(
solver_value
)
else
:
else
:
solver_decision
.
setSolverList
([])
solver_decision
.
setSolverList
([])
return
''
#return solver_decision.Delivery_viewSolveDivergenceDialog.listbox_solver_configuration.widget.render(
return
solver_decision
.
SolverDecision_render
(
context
)
return
solver_decision
.
SolverDecision_renderSolverConfiguration
(
context
)
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog.xml
View file @
1e3acb66
...
@@ -94,6 +94,7 @@
...
@@ -94,6 +94,7 @@
<string>
listbox_comment
</string>
<string>
listbox_comment
</string>
<string>
listbox_divergence
</string>
<string>
listbox_divergence
</string>
<string>
listbox_solver_configuration
</string>
<string>
listbox_solver_configuration
</string>
<string>
your_dummy_validator_field_for_gadget
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
@@ -102,6 +103,7 @@
...
@@ -102,6 +103,7 @@
<value>
<value>
<list>
<list>
<string>
your_workflow_action
</string>
<string>
your_workflow_action
</string>
<string>
your_dummy_html
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/gadget_solve_divergence_dialog.xml
View file @
1e3acb66
...
@@ -236,10 +236,24 @@
...
@@ -236,10 +236,24 @@
<key>
<string>
js_sandbox
</string>
</key>
<key>
<string>
js_sandbox
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<key>
<string>
renderjs_extra
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Solve Divergence
</string>
</value>
<value>
<string>
Solve Divergence
</string>
</value>
</item>
</item>
<item>
<key>
<string>
validator_field_id
</string>
</key>
<value>
<string>
your_dummy_validator_field_for_gadget
</string>
</value>
</item>
<item>
<key>
<string>
validator_form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</dictionary>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/listbox_solver.xml
View file @
1e3acb66
...
@@ -9,7 +9,9 @@
...
@@ -9,7 +9,9 @@
<item>
<item>
<key>
<string>
delegated_list
</string>
</key>
<key>
<string>
delegated_list
</string>
</key>
<value>
<value>
<list/>
<list>
<string>
default
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
...
@@ -50,6 +52,12 @@
...
@@ -50,6 +52,12 @@
<key>
<string>
tales
</string>
</key>
<key>
<string>
tales
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
default
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
...
@@ -69,6 +77,10 @@
...
@@ -69,6 +77,10 @@
<key>
<string>
values
</string>
</key>
<key>
<string>
values
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
listbox_solver
</string>
</value>
<value>
<string>
listbox_solver
</string>
</value>
...
@@ -91,4 +103,17 @@
...
@@ -91,4 +103,17 @@
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</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:\'\'
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/listbox_solver_configuration.xml
View file @
1e3acb66
...
@@ -6,6 +6,16 @@
...
@@ -6,6 +6,16 @@
</pickle>
</pickle>
<pickle>
<pickle>
<dictionary>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
editable
</string>
<string>
enabled
</string>
<string>
formbox_target_id
</string>
</list>
</value>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
listbox_solver_configuration
</string>
</value>
<value>
<string>
listbox_solver_configuration
</string>
</value>
...
@@ -44,6 +54,18 @@
...
@@ -44,6 +54,18 @@
<key>
<string>
tales
</string>
</key>
<key>
<string>
tales
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
editable
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
...
@@ -52,6 +74,12 @@
...
@@ -52,6 +74,12 @@
<key>
<string>
form_id
</string>
</key>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<key>
<string>
formbox_target_id
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
<item>
<item>
<key>
<string>
target
</string>
</key>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
<value>
<string></string>
</value>
...
@@ -63,6 +91,14 @@
...
@@ -63,6 +91,14 @@
<key>
<string>
values
</string>
</key>
<key>
<string>
values
</string>
</key>
<value>
<value>
<dictionary>
<dictionary>
<item>
<key>
<string>
editable
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
enabled
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<item>
<key>
<string>
field_id
</string>
</key>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
listbox_solver_configuration
</string>
</value>
<value>
<string>
listbox_solver_configuration
</string>
</value>
...
@@ -71,6 +107,10 @@
...
@@ -71,6 +107,10 @@
<key>
<string>
form_id
</string>
</key>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
erp5_simulation/Delivery_viewSolveDivergenceDialog
</string>
</value>
<value>
<string>
erp5_simulation/Delivery_viewSolveDivergenceDialog
</string>
</value>
</item>
</item>
<item>
<key>
<string>
formbox_target_id
</string>
</key>
<value>
<string>
Delivery_viewSolveDivergenceDialog_form_id_should_come_from_TALES
</string>
</value>
</item>
<item>
<item>
<key>
<string>
target
</string>
</key>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
<value>
<string>
Click to edit the target
</string>
</value>
...
@@ -81,4 +121,43 @@
...
@@ -81,4 +121,43 @@
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</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:cell != request and cell.getSolver()
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:cell != request and cell.getSolver()
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python:request.get(\'render_by_gadget\') and cell.getSolverValue().getConfigurationFormId()
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/your_dummy_html.xml
0 → 100644
View file @
1e3acb66
This diff is collapsed.
Click to expand it.
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/Delivery_viewSolveDivergenceDialog/your_dummy_validator_field_for_gadget.xml
0 → 100644
View file @
1e3acb66
This diff is collapsed.
Click to expand it.
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/SolverDecision_render.py
0 → 100644
View file @
1e3acb66
return
context
.
SolverDecision_renderSolverConfiguration
(
document
)
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/SolverDecision_render.xml
0 → 100644
View file @
1e3acb66
<?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>
document
</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>
SolverDecision_render
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_simulation_fast_input/SkinTemplateItem/portal_skins/erp5_simulation_fast_input/gadget_solve_divergence_dialog.js.js
View file @
1e3acb66
...
@@ -103,7 +103,7 @@ function loopEventListener(target, type, useCapture, callback) {
...
@@ -103,7 +103,7 @@ function loopEventListener(target, type, useCapture, callback) {
return
jIO
.
util
.
ajax
(
return
jIO
.
util
.
ajax
(
{
{
"
type
"
:
"
POST
"
,
"
type
"
:
"
POST
"
,
"
url
"
:
basedir
+
'
Delivery_getSolveDivergenceDialogParameterFormBox?solver=
'
+
event
.
target
.
value
+
"
&solver_decision_uid=
"
+
solver_decision_uid
,
"
url
"
:
basedir
+
'
Delivery_getSolveDivergenceDialogParameterFormBox?solver=
'
+
event
.
target
.
value
+
"
&solver_decision_uid=
"
+
solver_decision_uid
+
"
&render_by_gadget=1
"
,
"
xhrFields
"
:
{
"
xhrFields
"
:
{
withCredentials
:
true
withCredentials
:
true
}
}
...
...
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