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
45fe0b12
Commit
45fe0b12
authored
Apr 08, 2014
by
Sven Franck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app: allow dynamic data inside a list of children
parent
755a962a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
js/erp5_loader.js
js/erp5_loader.js
+7
-7
No files found.
js/erp5_loader.js
View file @
45fe0b12
...
...
@@ -4061,7 +4061,8 @@
storage
.
fetchConfigAttachment
=
function
(
obj
)
{
var
reply
,
store
;
if
(
obj
.
pass
&&
obj
.
pass
.
skip
)
{
// NOTE: obj.pass is undefined for storage etc > add pass = {}
if
(
obj
.
pass
&&
(
obj
.
pass
.
skip
||
obj
.
pass
.
no_config
))
{
return
RSVP
.
resolve
({
"
pass
"
:
obj
.
pass
});
}
...
...
@@ -5773,10 +5774,9 @@
"
purge
"
:
purge
};
// flag static data
if
(
!
content_dict
.
portal_type_source
&&
!
pass
.
url_dict
.
href
)
{
pass
.
skip
=
true
;
}
// flag static content and skip loading config
pass
.
skip
=
!
pass
.
url_dict
.
href
&&
!
pass
.
content_dict
.
portal_type_source
;
pass
.
no_config
=
pass
.
skip
||
!!
pass
.
content_dict
.
portal_type_source
;
// and go
return
storage
.
fetchConfigAttachment
({
...
...
@@ -5809,7 +5809,8 @@
if
(
!
pass
.
skip
)
{
// (dynamic element) config_dict
pass
.
config_dict
=
util
.
parse
(
reply
.
response
);
pass
.
config_dict
=
util
.
parse
(
reply
.
response
)
||
pass
.
content_dict
;
delete
pass
.
no_config
;
// test for auth based access
pass
.
grant
=
true
;
...
...
@@ -5818,7 +5819,6 @@
if
((
pass
.
grant
||
pass
.
mode
===
"
new
"
)
&&
pass
.
config_dict
.
portal_type_fields
)
{
app
.
util
.
loader
(
""
,
"
status_dict.loading_config
"
);
return
storage
.
fetchConfigAttachment
({
"
storage
"
:
app
.
storage_dict
.
settings
,
...
...
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