Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos.core
Commits
ad5c62c2
Commit
ad5c62c2
authored
May 22, 2019
by
Thomas Gambier
🚴🏼
Committed by
Rafael Monnerat
May 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[slapos_jio] authorize to load https JSON in http page
/reviewed-on
nexedi/slapos.core!114
parent
727782f1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_load_schema_js.js
...b_page_module/rjs_gadget_erp5_page_slap_load_schema_js.js
+2
-4
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_load_schema_js.xml
..._page_module/rjs_gadget_erp5_page_slap_load_schema_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js
...age_module/rjs_gadget_erp5_page_slap_parameter_form_js.js
+1
-0
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml
...ge_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml
+2
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_load_schema_js.js
View file @
ad5c62c2
...
...
@@ -7,10 +7,8 @@
function
getJSON
(
url
)
{
var
protocol
=
URI
(
url
).
protocol
();
if
(
protocol
===
"
http
"
||
protocol
===
"
https
"
)
{
if
(
URI
(
window
.
location
).
protocol
()
!==
protocol
)
{
throw
new
Error
(
"
You cannot mixed http and https calls
"
);
}
if
(
protocol
===
"
http
"
&&
URI
(
window
.
location
).
protocol
()
==
"
https
"
)
{
throw
new
Error
(
"
You cannot load http JSON in https page
"
);
}
return
RSVP
.
Queue
()
.
push
(
function
()
{
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_load_schema_js.xml
View file @
ad5c62c2
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
1.50940.46169.22476
</string>
</value>
<value>
<string>
97
5.40310.53592.2542
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15
42815972.88
</float>
<float>
15
58534002.71
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js
View file @
ad5c62c2
...
...
@@ -877,6 +877,7 @@
.
fail
(
function
(
error
)
{
var
parameter_xml
=
''
;
console
.
warn
(
error
);
console
.
log
(
error
.
stack
);
if
(
gadget
.
options
.
value
.
parameter
.
parameter_hash
!==
undefined
)
{
parameter_xml
=
atob
(
gadget
.
options
.
value
.
parameter
.
parameter_hash
);
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml
View file @
ad5c62c2
...
...
@@ -274,7 +274,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
1.50926.27080.61815
</string>
</value>
<value>
<string>
97
5.40310.53592.2542
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -292,7 +292,7 @@
</tuple>
<state>
<tuple>
<float>
15
42815548.03
</float>
<float>
15
58534050.09
</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