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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Georgios Dagkakis
erp5
Commits
2884a998
Commit
2884a998
authored
Oct 09, 2018
by
Georgios Dagkakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formulator: Do not add empty item if item_list is empty for SingleItemsWidget and MultiItemsWidget
parent
81e17101
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
product/Formulator/Widget.py
product/Formulator/Widget.py
+3
-9
No files found.
product/Formulator/Widget.py
View file @
2884a998
...
@@ -839,9 +839,7 @@ class SingleItemsWidget(ItemsWidget):
...
@@ -839,9 +839,7 @@ class SingleItemsWidget(ItemsWidget):
cell
=
getattr
(
REQUEST
,
'cell'
,
None
)
cell
=
getattr
(
REQUEST
,
'cell'
,
None
)
items
=
field
.
get_value
(
'items'
,
REQUEST
=
REQUEST
,
cell
=
cell
)
items
=
field
.
get_value
(
'items'
,
REQUEST
=
REQUEST
,
cell
=
cell
)
if
not
items
:
if
not
items
:
# single item widget should have at least one child in order to produce
return
[]
# valid XHTML; keep it enabled otherwise field validator always fails
return
[
self
.
render_item
(
''
,
''
,
''
,
''
,
''
)]
# check if we want to select first item
# check if we want to select first item
if
not
value
and
field
.
get_value
(
'first_item'
,
REQUEST
=
REQUEST
,
if
not
value
and
field
.
get_value
(
'first_item'
,
REQUEST
=
REQUEST
,
...
@@ -981,12 +979,8 @@ class MultiItemsWidget(ItemsWidget):
...
@@ -981,12 +979,8 @@ class MultiItemsWidget(ItemsWidget):
items
=
field
.
get_value
(
'items'
,
REQUEST
=
REQUEST
,
cell
=
getattr
(
REQUEST
,
'cell'
,
None
))
# Added request
items
=
field
.
get_value
(
'items'
,
REQUEST
=
REQUEST
,
cell
=
getattr
(
REQUEST
,
'cell'
,
None
))
# Added request
from
Products.ERP5Form.MultiLinkField
import
MultiLinkFieldWidget
from
Products.ERP5Form.MultiLinkField
import
MultiLinkFieldWidget
if
not
items
and
not
isinstance
(
self
,
MultiLinkFieldWidget
):
if
not
items
:
# multi items widget should have at least one child in order to produce
return
[]
# valid XHTML; disable it so user can not select it.
# This cannot be applied to MultiLinkFields, which are just some <a>
# links
return
[
self
.
render_item
(
''
,
''
,
''
,
''
,
'disabled="disabled"'
)]
css_class
=
field
.
get_value
(
'css_class'
)
css_class
=
field
.
get_value
(
'css_class'
)
extra_item
=
field
.
get_value
(
'extra_item'
)
extra_item
=
field
.
get_value
(
'extra_item'
)
...
...
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