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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
f64ff1cc
Commit
f64ff1cc
authored
Jan 30, 2020
by
Romain Courteaud
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "erp5_web_renderjs_ui: experiment router absolute url"
This reverts commit
3bea5dc5
.
parent
513f3b79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
10 deletions
+3
-10
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
...TemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
+1
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
f64ff1cc
...
...
@@ -193,8 +193,6 @@
prefix
=
'
&
'
;
}
}
result
=
new
URL
(
result
,
window
.
location
.
href
).
href
;
console
.
log
(
'
getDisplayUrlFor
'
,
result
);
return
result
;
}
...
...
@@ -248,8 +246,6 @@
// Build URL template to allow getting user information
result
+=
'
{
'
+
prefix
+
'
n.me}
'
;
}
result
=
new
URL
(
result
,
window
.
location
.
href
).
href
;
console
.
log
(
'
getCommandUrlFor
'
,
result
);
return
result
;
}
...
...
@@ -274,13 +270,10 @@
}
else
{
hash
=
getCommandUrlFor
(
gadget
,
'
error
'
,
options
);
}
/*
if
(
absolute_url
)
{
hash
=
new
URL
(
hash
,
window
.
location
.
href
).
href
;
}
*/
// hash = new URL(hash, window.location.href).href;
console
.
log
(
'
getCommandUrlForMethod
'
,
hash
);
return
hash
;
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
f64ff1cc
...
...
@@ -236,7 +236,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
981.
31978.24115.63214
</string>
</value>
<value>
<string>
981.
4330.60289.19831
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>
15
80308478.72
</float>
<float>
15
78649655.03
</float>
<string>
UTC
</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