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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
4862c62b
Commit
4862c62b
authored
Jul 29, 2022
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Service list as Frontpage
See merge request
nexedi/slapos.core!409
parents
073fdf6d
736f776c
Changes
22
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
147 additions
and
92 deletions
+147
-92
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_compute_node_list_js.js
..._module/rjs_gadget_erp5_page_slap_compute_node_list_js.js
+4
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_compute_node_list_js.xml
...module/rjs_gadget_erp5_page_slap_compute_node_list_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_erp5_login_view_js.js
...ge_module/rjs_gadget_erp5_page_slap_erp5_login_view_js.js
+4
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_erp5_login_view_js.xml
...e_module/rjs_gadget_erp5_page_slap_erp5_login_view_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.js
..._page_module/rjs_gadget_erp5_page_slap_invoice_list_js.js
+10
-11
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.xml
...page_module/rjs_gadget_erp5_page_slap_invoice_list_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_network_list_js.js
..._page_module/rjs_gadget_erp5_page_slap_network_list_js.js
+4
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_network_list_js.xml
...page_module/rjs_gadget_erp5_page_slap_network_list_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.js
...b_page_module/rjs_gadget_erp5_page_slap_person_view_js.js
+13
-14
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.xml
..._page_module/rjs_gadget_erp5_page_slap_person_view_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.js
..._page_module/rjs_gadget_erp5_page_slap_project_list_js.js
+4
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.xml
...page_module/rjs_gadget_erp5_page_slap_project_list_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.js
..._page_module/rjs_gadget_erp5_page_slap_service_list_js.js
+4
-6
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.xml
...page_module/rjs_gadget_erp5_page_slap_service_list_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.js
...web_page_module/rjs_gadget_erp5_page_slap_site_list_js.js
+4
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.xml
...eb_page_module/rjs_gadget_erp5_page_slap_site_list_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_list_js.js
...b_page_module/rjs_gadget_erp5_page_slap_ticket_list_js.js
+5
-6
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_list_js.xml
..._page_module/rjs_gadget_erp5_page_slap_ticket_list_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js
...ateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js
+10
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml
...teItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_site_module/hostingjs.xml
...slapos_jio/PathTemplateItem/web_site_module/hostingjs.xml
+3
-3
master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt
...ortal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt
+62
-5
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_compute_node_list_js.js
View file @
4862c62b
...
@@ -130,15 +130,14 @@
...
@@ -130,15 +130,14 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updatePanel
({
return
gadget
.
getSetting
(
'
frontpage_gadget
'
);
jio_key
:
"
compute_node_module
"
});
})
})
.
push
(
function
()
{
.
push
(
function
(
frontpage_gadget
)
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_add_compute_node
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_add_compute_node
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
"
slap_compute_node_get_token
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
"
slap_compute_node_get_token
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slapos
"
}})
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
frontpage_gadget
}}),
gadget
.
updatePanel
({
jio_key
:
"
compute_node_module
"
})
]);
]);
})
})
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_compute_node_list_js.xml
View file @
4862c62b
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
1001.
20429.28253.1211
</string>
</value>
<value>
<string>
1001.
59387.30502.30993
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
165
6703797.9
</float>
<float>
165
9068807.75
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_erp5_login_view_js.js
View file @
4862c62b
...
@@ -68,7 +68,6 @@
...
@@ -68,7 +68,6 @@
hateoas_url
+
gadget
.
state
.
jio_key
+
"
/Login_edit
"
,
doc
);
hateoas_url
+
gadget
.
state
.
jio_key
+
"
/Login_edit
"
,
doc
);
})
})
.
push
(
function
(
response
)
{
.
push
(
function
(
response
)
{
var
redirect_url
;
if
(
response
.
target
===
undefined
)
{
if
(
response
.
target
===
undefined
)
{
return
gadget
.
notifySubmitted
({
message
:
gadget
.
message2_translation
,
status
:
'
success
'
});
return
gadget
.
notifySubmitted
({
message
:
gadget
.
message2_translation
,
status
:
'
success
'
});
}
}
...
@@ -77,10 +76,13 @@
...
@@ -77,10 +76,13 @@
// The script required to launch a redirect
// The script required to launch a redirect
return
gadget
.
notifySubmitted
({
message
:
gadget
.
message2_translation
,
status
:
'
success
'
})
return
gadget
.
notifySubmitted
({
message
:
gadget
.
message2_translation
,
status
:
'
success
'
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
getSetting
(
'
frontpage_gadget
'
);
})
.
push
(
function
(
frontpage_gadget
)
{
return
gadget
.
getUrlFor
({
return
gadget
.
getUrlFor
({
command
:
'
display
'
,
command
:
'
display
'
,
absolute_url
:
true
,
absolute_url
:
true
,
options
:
{
"
jio_key
"
:
"
/
"
,
"
page
"
:
"
slapos
"
}
options
:
{
"
jio_key
"
:
"
/
"
,
"
page
"
:
frontpage_gadget
}
})
})
})
})
.
push
(
function
(
came_from
)
{
.
push
(
function
(
came_from
)
{
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_erp5_login_view_js.xml
View file @
4862c62b
...
@@ -247,7 +247,7 @@
...
@@ -247,7 +247,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
986.45437.22132.61764
</string>
</value>
<value>
<string>
1001.59838.52231.28228
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -265,7 +265,7 @@
...
@@ -265,7 +265,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
16
02260156.69
</float>
<float>
16
59068549.98
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.js
View file @
4862c62b
...
@@ -168,11 +168,6 @@
...
@@ -168,11 +168,6 @@
}
}
});
});
})
})
.
push
(
function
()
{
return
gadget
.
updatePanel
({
jio_key
:
"
accounting_module
"
});
})
.
push
(
function
()
{
.
push
(
function
()
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getSetting
(
"
hateoas_url
"
),
gadget
.
getSetting
(
"
hateoas_url
"
),
...
@@ -180,18 +175,22 @@
...
@@ -180,18 +175,22 @@
]);
]);
})
})
.
push
(
function
(
url_list
)
{
.
push
(
function
(
url_list
)
{
return
gadget
.
jio_getAttachment
(
"
contract_relative_url
"
,
return
RSVP
.
all
([
url_list
[
0
]
+
url_list
[
1
]
+
"
/Person_getCloudContractRelated?return_json=True
"
);
gadget
.
jio_getAttachment
(
"
contract_relative_url
"
,
url_list
[
0
]
+
url_list
[
1
]
+
"
/Person_getCloudContractRelated?return_json=True
"
),
gadget
.
updatePanel
({
jio_key
:
"
accounting_module
"
}),
gadget
.
getSetting
(
'
frontpage_gadget
'
)
]);
})
})
.
push
(
function
(
contract_relative_url
)
{
.
push
(
function
(
result
)
{
var
promise_list
=
[
var
promise_list
=
[
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slapos
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
result
[
2
]
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_rss_ticket
"
,
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_rss_ticket
"
,
"
jio_key
"
:
"
accounting_module
"
}})
"
jio_key
"
:
"
accounting_module
"
}})
];
];
if
(
contract_relative_url
)
{
if
(
result
[
0
]
)
{
promise_list
.
push
(
promise_list
.
push
(
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
jio_key
"
:
contract_relative_url
,
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
jio_key
"
:
result
[
0
]
,
"
page
"
:
"
slap_controller
"
}})
"
page
"
:
"
slap_controller
"
}})
);
);
}
}
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.xml
View file @
4862c62b
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
992.9642.18182.11008
</string>
</value>
<value>
<string>
1001.59414.5078.17476
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
16
21359340.83
</float>
<float>
16
59068942.39
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_network_list_js.js
View file @
4862c62b
...
@@ -123,14 +123,13 @@
...
@@ -123,14 +123,13 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updatePanel
({
return
gadget
.
getSetting
(
'
frontpage_gadget
'
);
jio_key
:
"
computer_network_module
"
});
})
})
.
push
(
function
()
{
.
push
(
function
(
frontpage_gadget
)
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_add_network
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_add_network
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slapos
"
}})
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
frontpage_gadget
}}),
gadget
.
updatePanel
({
jio_key
:
"
computer_network_module
"
})
]);
]);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_network_list_js.xml
View file @
4862c62b
...
@@ -247,7 +247,7 @@
...
@@ -247,7 +247,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
100
0.2322.46712.16657
</string>
</value>
<value>
<string>
100
1.59379.40192.59272
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -265,7 +265,7 @@
...
@@ -265,7 +265,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
165
6703774.51
</float>
<float>
165
9068921.68
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.js
View file @
4862c62b
...
@@ -307,23 +307,22 @@
...
@@ -307,23 +307,22 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updatePanel
({
return
RSVP
.
all
([
jio_key
:
"
person_module
"
window
.
getSettingMe
(
gadget
),
});
gadget
.
getSetting
(
'
frontpage_gadget
'
)
})
]);
.
push
(
function
()
{
return
window
.
getSettingMe
(
gadget
);
})
})
.
push
(
function
(
me
)
{
.
push
(
function
(
setting_list
)
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
editable
:
true
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
editable
:
true
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
me
,
page
:
"
slap_person_revoke_certificate
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
setting_list
[
0
],
page
:
"
slap_person_revoke_certificate
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
me
,
page
:
"
slap_person_request_certificate
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
setting_list
[
0
],
page
:
"
slap_person_request_certificate
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
me
,
page
:
"
slap_person_get_token
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
setting_list
[
0
],
page
:
"
slap_person_get_token
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
me
,
page
:
"
slap_person_add_erp5_login
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
setting_list
[
0
],
page
:
"
slap_person_add_erp5_login
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
me
,
page
:
"
slap_person_add_organisation
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
setting_list
[
0
],
page
:
"
slap_person_add_organisation
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
"
slapos
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
page
:
setting_list
[
1
]}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
gadget
.
state
.
doc
.
contract_relative_url
,
page
:
"
slap_controller
"
}})
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
jio_key
:
gadget
.
state
.
doc
.
contract_relative_url
,
page
:
"
slap_controller
"
}}),
gadget
.
updatePanel
({
jio_key
:
"
person_module
"
})
]);
]);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.xml
View file @
4862c62b
...
@@ -245,7 +245,7 @@
...
@@ -245,7 +245,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
987.49476.87.8891
</string>
</value>
<value>
<string>
1001.59425.29682.52855
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -263,7 +263,7 @@
...
@@ -263,7 +263,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
16
21547040.5
9
</float>
<float>
16
59068534.6
9
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.js
View file @
4862c62b
...
@@ -84,14 +84,13 @@
...
@@ -84,14 +84,13 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updatePanel
({
return
gadget
.
getSetting
(
'
frontpage_gadget
'
);
jio_key
:
"
project_module
"
});
})
})
.
push
(
function
()
{
.
push
(
function
(
frontpage_gadget
)
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_add_project
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_add_project
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slapos
"
}})
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
frontpage_gadget
}}),
gadget
.
updatePanel
({
jio_key
:
"
project_module
"
})
]);
]);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.xml
View file @
4862c62b
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
100
0.2322.46712.16657
</string>
</value>
<value>
<string>
100
1.59376.11750.51012
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
165
6975508.53
</float>
<float>
165
9068904.46
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.js
View file @
4862c62b
...
@@ -87,15 +87,13 @@
...
@@ -87,15 +87,13 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updatePanel
({
return
gadget
.
getSetting
(
'
frontpage_gadget
'
);
jio_key
:
"
instance_tree_module
"
});
})
})
.
push
(
function
()
{
.
push
(
function
(
frontpage_gadget
)
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
display_dialog_with_history
"
,
options
:
{
"
page
"
:
"
slap_select_software_product
"
}}),
gadget
.
getUrlFor
({
command
:
"
display_dialog_with_history
"
,
options
:
{
"
page
"
:
"
slap_select_software_product
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slapos
"
}})
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
frontpage_gadget
}}),
gadget
.
updatePanel
({
jio_key
:
"
instance_tree_module
"
})
]);
]);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.xml
View file @
4862c62b
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
999.2068.62564.17
</string>
</value>
<value>
<string>
1001.59388.52713.22408
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
165
5115655.51
</float>
<float>
165
9068879.32
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.js
View file @
4862c62b
...
@@ -147,17 +147,16 @@
...
@@ -147,17 +147,16 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updatePanel
({
return
gadget
.
getSetting
(
'
frontpage_gadget
'
);
jio_key
:
'
organisation_module
'
});
})
})
.
push
(
function
()
{
.
push
(
function
(
frontpage_gadget
)
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
gadget
.
getUrlFor
({
command
:
'
change
'
,
command
:
'
change
'
,
options
:
{
page
:
'
slap_add_organisation
'
}
options
:
{
page
:
'
slap_add_organisation
'
}
}),
}),
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
'
slapos
'
}
})
gadget
.
getUrlFor
({
command
:
'
change
'
,
options
:
{
page
:
frontpage_gadget
}}),
gadget
.
updatePanel
({
jio_key
:
'
organisation_module
'
})
]);
]);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.xml
View file @
4862c62b
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
999.2068.62564.17
</string>
</value>
<value>
<string>
1001.59386.28929.32102
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
165
6975585.67
</float>
<float>
165
9068860.66
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_list_js.js
View file @
4862c62b
...
@@ -96,16 +96,15 @@
...
@@ -96,16 +96,15 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updatePanel
({
return
gadget
.
getSetting
(
'
frontpage_gadget
'
);
jio_key
:
"
support_request_module
"
});
})
})
.
push
(
function
()
{
.
push
(
function
(
frontpage_gadget
)
{
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_add_ticket
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_add_ticket
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_rss_ticket
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_rss_ticket
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slapos
"
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
frontpage_gadget
}}),
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_rss_critical_ticket
"
}})
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
"
slap_rss_critical_ticket
"
}}),
gadget
.
updatePanel
({
jio_key
:
"
support_request_module
"
})
]);
]);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_list_js.xml
View file @
4862c62b
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.32417.7827.45414
</string>
</value>
<value>
<string>
1001.59377.44199.3498
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
584094338.1
</float>
<float>
1
659068844.09
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js
View file @
4862c62b
...
@@ -324,13 +324,18 @@
...
@@ -324,13 +324,18 @@
});
});
})
})
.
push
(
function
()
{
.
push
(
function
()
{
return
gadget
.
updatePanel
({
return
gadget
.
getSetting
(
'
frontpage_gadget
'
);
jio_key
:
false
});
})
})
.
push
(
function
()
{
.
push
(
function
(
frontpage_gadget
)
{
return
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
"
change
"
,
options
:
{
"
page
"
:
frontpage_gadget
}}),
gadget
.
updatePanel
({
jio_key
:
false
})
]);
})
.
push
(
function
(
url_list
)
{
return
gadget
.
updateHeader
({
return
gadget
.
updateHeader
({
page_title
:
gadget
.
page_title_translation
page_title
:
gadget
.
page_title_translation
,
selection_url
:
url_list
[
0
]
});
});
});
});
})
})
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml
View file @
4862c62b
...
@@ -247,7 +247,7 @@
...
@@ -247,7 +247,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
100
0.49358.14576.324
</string>
</value>
<value>
<string>
100
1.59393.60810.27067
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -265,7 +265,7 @@
...
@@ -265,7 +265,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
165
6976814.1
</float>
<float>
165
9068824.06
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_site_module/hostingjs.xml
View file @
4862c62b
...
@@ -414,7 +414,7 @@
...
@@ -414,7 +414,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
configuration_frontpage_gadget_url
</string>
</key>
<key>
<string>
configuration_frontpage_gadget_url
</string>
</key>
<value>
<string>
slap
os
</string>
</value>
<value>
<string>
slap
_service_list
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
configuration_hateoas_url
</string>
</key>
<key>
<string>
configuration_hateoas_url
</string>
</key>
...
@@ -701,7 +701,7 @@
...
@@ -701,7 +701,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
100
0.41365.61594.63982
</string>
</value>
<value>
<string>
100
1.26171.19762.42854
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -719,7 +719,7 @@
...
@@ -719,7 +719,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
165
4507392.23
</float>
<float>
165
9036783.36
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt
View file @
4862c62b
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<tal:block metal:define-macro="slapos_wait_for_activities_and_front_page">
<tal:block metal:define-macro="slapos_wait_for_activities_and_front_page">
<tal:block tal:define="web_site_id python: 'hostingjs'">
<tal:block tal:define="web_site_id python: 'hostingjs'
;
">
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page_base" />
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page_base" />
</tal:block>
</tal:block>
</tal:block>
</tal:block>
...
@@ -220,18 +220,76 @@
...
@@ -220,18 +220,76 @@
</tal:block>
</tal:block>
<tal:block metal:define-macro="slapos_wait_for_front_page">
<tal:block metal:define-macro="slapos_wait_for_front_page">
<tr>
<td>waitForElementPresent</td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//a[@data-i18n=\'%s\']' % (here.Base_translateString('Services', lang=lang))"></td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//a[@data-i18n=\'%s\']' % (here.Base_translateString('Services', lang=lang))"></td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_field_listbox.html')]//h1//a[contains(@class, "ui-icon-spinner")]</td>
<td></td>
</tr>
<tr>
<td>assertElementNotPresent</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_field_listbox.html')]//h1//a[contains(@class, "ui-icon-spinner")]</td>
<td></td>
</tr>
<tal:block define="menu_item python: 'Dashboard'; header menu_item ">
<tr>
<td colspan="3"><b tal:content="python: 'Access Entry on the Menu for : %s' % menu_item"> Menu Item </b></td>
</tr>
<tr>
<td>click</td>
<td>//button[@data-i18n='Menu']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//button[@data-i18n='Menu']</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//button[@data-i18n='Menu']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_panel.html\')]//a[@data-i18n=\'%s\']' % (menu_item)"></td>
<td></td>
</tr>
<tr>
<td>click</td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_panel.html\')]//a[@data-i18n=\'%s\']' % (menu_item)"></td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/wait_for_content_loaded" />
<tr>
<td>assertElementPresent</td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//a[@data-i18n=\'%s\']' % here.Base_translateString(menu_item, lang=lang)"></td>
<td></td>
</tr>
</tal:block>
<tr>
<tr>
<td colspan="3"><b>Wait for Dashboard on header and front page elements</b></td>
<td colspan="3"><b>Wait for Dashboard on header and front page elements</b></td>
</tr>
</tr>
<!-- Dashboard -->
<!-- Dashboard -->
<tr>
<tr>
<td>waitForElementPresent</td>
<td>waitForElementPresent</td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//
span
[@data-i18n=\'%s\']' % (here.Base_translateString('Dashboard', lang=lang))"></td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//
a
[@data-i18n=\'%s\']' % (here.Base_translateString('Dashboard', lang=lang))"></td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>assertElementPresent</td>
<td>assertElementPresent</td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//
span
[@data-i18n=\'%s\']' % (here.Base_translateString('Dashboard', lang=lang))"></td>
<td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//
a
[@data-i18n=\'%s\']' % (here.Base_translateString('Dashboard', lang=lang))"></td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
...
@@ -1192,7 +1250,6 @@
...
@@ -1192,7 +1250,6 @@
<td>//div[contains(@data-gadget-url, 'gadget_slapos_panel.html')]//dl[@class="dl-contextual-help"]</td>
<td>//div[contains(@data-gadget-url, 'gadget_slapos_panel.html')]//dl[@class="dl-contextual-help"]</td>
<td></td>
<td></td>
</tr>
</tr>
</tal:block>
</tal:block>
<tal:block metal:define-macro="suspend_user_tickets">
<tal:block metal:define-macro="suspend_user_tickets">
...
...
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