From 005019b0e6e13b3bbc97bfa7852813923c91bb2a Mon Sep 17 00:00:00 2001 From: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com> Date: Wed, 8 Jan 2020 15:48:23 +0200 Subject: [PATCH] Endless settings on templates and instances (#3778) * Endless settings on templates and instances * Removed unintentionaly committed file * Fix indentation Co-authored-by: Anurag Awasthi --- ui/scripts/instances.js | 7 +++++++ ui/scripts/templates.js | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 3e54a77c084..6d7e26fd9d1 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -3433,6 +3433,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) { diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index d15a2c18898..92167335958 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -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: {