etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.13 to master 

* 4.13:
  Endless settings on templates and instances (#3778)
This commit is contained in:
Daan Hoogland 2020-01-08 14:49:36 +01:00
parent 7ceb82c604 005019b0e6
commit f2708d6636
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/scripts/instances.js
View File

@ -3437,6 +3437,13 @@
custom: cloudStack.uiCustom.granularDetails({
resourceType: 'UserVm',
dataProvider: function(args) {
// no paging for listVirtualMachines details
if (args.page > 1) {
args.response.success({
data: []
});
return;
}
$.ajax({
url: createURL('listVirtualMachines&id=' + args.context.instances[0].id),
success: function(json) {

7
ui/scripts/templates.js
View File

@ -2489,6 +2489,13 @@
custom: cloudStack.uiCustom.granularDetails({
resourceType: 'Template',
dataProvider: function(args) {
// no paging for listTemplates details
if (args.page > 1) {
args.response.success({
data: []
});
return;
}
$.ajax({
url: createURL('listTemplates'),
data: {