Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ecommerce-ui
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
nexedi
ecommerce-ui
Commits
51b67649
Commit
51b67649
authored
Apr 29, 2014
by
Sven Franck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app: fixed wrong elements generated because not resetting type in loop
parent
e7f6c49d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
9 deletions
+12
-9
js/erp5_loader.js
js/erp5_loader.js
+12
-9
No files found.
js/erp5_loader.js
View file @
51b67649
...
...
@@ -217,6 +217,7 @@
// add missing logic
spec
.
logic
=
spec
.
logic
||
{};
spec
.
attributes
=
spec
.
attributes
||
{};
// enhanced!
spec
.
attributes
[
"
data-enhanced
"
]
=
true
;
...
...
@@ -3716,6 +3717,7 @@
for
(
j
=
0
;
j
<
item
.
scheme
.
length
;
j
+=
1
)
{
segment
=
item
.
scheme
[
j
];
field_list
=
[];
type
=
null
;
// loop scheme field_list
for
(
k
=
0
;
k
<
segment
.
field_list
.
length
;
k
+=
1
)
{
...
...
@@ -3949,7 +3951,7 @@
loaded_options
=
answer
.
response
;
// need to handle multi radio/checkbox groups...
// need to handle multi radio/checkbox groups...
and selects????
if
(
loaded_options
)
{
push
=
answer
.
pass
.
push
;
...
...
@@ -4038,6 +4040,7 @@
for
(
m
=
0
;
m
<
section_response_list
.
length
;
m
+=
1
)
{
helper
.
children
.
push
(
section_response_list
[
m
]);
}
return
RSVP
.
resolve
(
helper
);
})
.
fail
(
app
.
util
.
error
);
...
...
@@ -6344,6 +6347,14 @@
data_total_rows
=
pointer_results
.
data
.
total_rows
;
}
// kids (must be declared before wrapper, because some wrapper need length
if
(
pass
.
content_dict
.
view_dict
)
{
kids
=
pass
.
content_dict
.
view_dict
[
pass
.
url_dict
.
mode
]
||
pass
.
content_dict
.
view_dict
[
"
default
"
];
}
else
{
kids
=
pass
.
content_dict
.
children
||
pass
.
config_dict
.
children
||
[];
}
// set generator
if
(
pass
.
skip
)
{
if
(
!
pass
.
content_dict
.
generate
)
{
...
...
@@ -6380,14 +6391,6 @@
}
}
// kids (must be declared before wrapper, because some wrapper need length
if
(
pass
.
content_dict
.
view_dict
)
{
kids
=
pass
.
content_dict
.
view_dict
[
pass
.
url_dict
.
mode
]
||
pass
.
content_dict
.
view_dict
[
"
default
"
];
}
else
{
kids
=
pass
.
content_dict
.
children
||
pass
.
config_dict
.
children
||
[];
}
// wrapper object and properties
quirk_dict
=
util
.
mergeObject
(
(
pass
[
method
?
"
content_dict
"
:
"
config_dict
"
].
property_dict
),
...
...
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