Updated Branches:
refs/heads/master 28fcd3629 -> ab42f7447
CLOUDSTACK-5771: UI > Infrastructure > SystemVMs/PrimaryStorage/SecondaryStorage/Pod/Cluster/Hosts/CacheStorage page - pass keyword parameter instead of name parameter to listXXXXXXX API.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ab42f744
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ab42f744
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ab42f744
Branch: refs/heads/master
Commit: ab42f74470a0ca3705b376177c98e72094adabe8
Parents: 28fcd36
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jan 3 14:23:44 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jan 3 14:24:32 2014 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 107 ++++++++++++++++------------------------------
1 file changed, 37 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab42f744/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 24e76e6..ad92b3c 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -7604,17 +7604,13 @@
},
pods: function() {
var listView = $.extend(true, {}, cloudStack.sections.system.subsections.pods.listView, {
- dataProvider: function(args) {
- var searchByArgs = args.filterBy.search.value.length ?
- '&name=' + args.filterBy.search.value : '';
-
+ dataProvider: function(args) {
+ var data = {};
+ listViewDataProvider(args, data);
+
$.ajax({
- url: createURL('listPods' + searchByArgs),
- data: {
- page: args.page,
- pageSize: pageSize,
- listAll: true
- },
+ url: createURL('listPods'),
+ data: data,
success: function(json) {
args.response.success({
data: json.listpodsresponse.pod
@@ -7654,17 +7650,13 @@
},
clusters: function() {
var listView = $.extend(true, {}, cloudStack.sections.system.subsections.clusters.listView, {
- dataProvider: function(args) {
- var searchByArgs = args.filterBy.search.value.length ?
- '&name=' + args.filterBy.search.value : '';
-
+ dataProvider: function(args) {
+ var data = {};
+ listViewDataProvider(args, data);
+
$.ajax({
- url: createURL('listClusters' + searchByArgs),
- data: {
- page: args.page,
- pageSize: pageSize,
- listAll: true
- },
+ url: createURL('listClusters'),
+ data: data,
success: function(json) {
args.response.success({
data: json.listclustersresponse.cluster
@@ -7704,19 +7696,14 @@
},
hosts: function() {
var listView = $.extend(true, {}, cloudStack.sections.system.subsections.hosts.listView, {
- dataProvider: function(args) {
- var searchByArgs = args.filterBy.search.value.length ?
- '&name=' + args.filterBy.search.value : '';
-
+ dataProvider: function(args) {
var data = {
- page: args.page,
- pageSize: pageSize,
- type: 'routing',
- listAll: true
+ type: 'routing'
};
-
+ listViewDataProvider(args, data);
+
$.ajax({
- url: createURL('listHosts' + searchByArgs),
+ url: createURL('listHosts'),
data: data,
success: function(json) {
args.response.success({
@@ -7757,18 +7744,12 @@
},
primaryStorage: function() {
var listView = $.extend(true, {}, cloudStack.sections.system.subsections['primary-storage'].listView, {
- dataProvider: function(args) {
- var searchByArgs = args.filterBy.search.value.length ?
- '&name=' + args.filterBy.search.value : '';
-
- var data = {
- page: args.page,
- pageSize: pageSize,
- listAll: true
- };
+ dataProvider: function(args) {
+ var data = {};
+ listViewDataProvider(args, data);
$.ajax({
- url: createURL('listStoragePools' + searchByArgs),
+ url: createURL('listStoragePools'),
data: data,
success: function(json) {
args.response.success({
@@ -7815,19 +7796,14 @@
sections: {
secondaryStorage: {
listView: {
- dataProvider: function(args) {
- var searchByArgs = args.filterBy.search.value.length ?
- '&name=' + args.filterBy.search.value : '';
-
+ dataProvider: function(args) {
var data = {
- type: 'SecondaryStorage',
- page: args.page,
- pageSize: pageSize,
- listAll: true
+ type: 'SecondaryStorage'
};
-
+ listViewDataProvider(args, data);
+
$.ajax({
- url: createURL('listImageStores' + searchByArgs),
+ url: createURL('listImageStores'),
data: data,
success: function(json) {
var items = json.listimagestoresresponse.imagestore;
@@ -7849,17 +7825,12 @@
},
cacheStorage: {
listView: {
- dataProvider: function(args) {
- var searchByArgs = args.filterBy.search.value.length ?
- '&name=' + args.filterBy.search.value : '';
-
- var data = {
- page: args.page,
- pageSize: pageSize
- };
-
+ dataProvider: function(args) {
+ var data = {};
+ listViewDataProvider(args, data);
+
$.ajax({
- url: createURL('listSecondaryStagingStores' + searchByArgs),
+ url: createURL('listSecondaryStagingStores'),
data: data,
success: function(json) {
args.response.success({
@@ -7893,17 +7864,13 @@
},
systemVms: function() {
var listView = $.extend(true, {}, cloudStack.sections.system.subsections.systemVms.listView, {
- dataProvider: function(args) {
- var searchByArgs = args.filterBy.search.value.length ?
- '&name=' + args.filterBy.search.value : '';
-
+ dataProvider: function(args) {
+ var data = {};
+ listViewDataProvider(args, data);
+
$.ajax({
- url: createURL('listSystemVms' + searchByArgs),
- data: {
- page: args.page,
- pageSize: pageSize,
- listAll: true
- },
+ url: createURL('listSystemVms'),
+ data: data,
success: function(json) {
var systemvmObjs = json.listsystemvmsresponse.systemvm;
if (systemvmObjs != null) {