You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/01/08 13:48:39 UTC
[cloudstack] branch 4.13 updated: Endless settings on templates and
instances (#3778)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.13 by this push:
new 005019b Endless settings on templates and instances (#3778)
005019b is described below
commit 005019b0e6e13b3bbc97bfa7852813923c91bb2a
Author: Spaceman1984 <49...@users.noreply.github.com>
AuthorDate: Wed Jan 8 15:48:23 2020 +0200
Endless settings on templates and instances (#3778)
* Endless settings on templates and instances
* Removed unintentionaly committed file
* Fix indentation
Co-authored-by: Anurag Awasthi <an...@shapeblue.com>
---
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 3e54a77..6d7e26f 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 d15a2c1..9216733 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: {