You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/12/20 22:38:28 UTC
git commit: updated refs/heads/4.3 to 281d832
Updated Branches:
refs/heads/4.3 6e4192dc4 -> 281d8323c
CLOUDSTACK-5551: Pass search 'name' field to listConfigurations UI
Passes search bar value (by 'name') for the settings in the following sections'
detail views:
-Account
-Primary storage
-Cluster
-Zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/281d8323
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/281d8323
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/281d8323
Branch: refs/heads/4.3
Commit: 281d8323c555fe8209702f982932a4b03eb94e25
Parents: 6e4192d
Author: Brian Federle <br...@citrix.com>
Authored: Fri Dec 20 13:37:59 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Dec 20 13:37:59 2013 -0800
----------------------------------------------------------------------
ui/scripts/accounts.js | 7 +------
ui/scripts/sharedFunctions.js | 14 ++++++++++----
ui/scripts/system.js | 18 +++---------------
3 files changed, 14 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/281d8323/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 8780206..0293992 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -851,15 +851,10 @@
dataProvider: function(args) {
$.ajax({
url: createURL('listConfigurations&accountid=' + args.context.accounts[0].id),
- data: {
- page: args.page,
- pageSize: pageSize,
- listAll: true
- },
+ data: listViewDataProvider(args, {}, { searchBy: 'name' }),
success: function(json) {
args.response.success({
data: json.listconfigurationsresponse.configuration
-
});
},
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/281d8323/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 66eaf7a..a632850 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -1120,7 +1120,7 @@ cloudStack.converters = {
//data parameter passed to API call in listView
-function listViewDataProvider(args, data) {
+function listViewDataProvider(args, data, options) {
//search
if (args.filterBy != null) {
if (args.filterBy.advSearch != null && typeof(args.filterBy.advSearch) == "object") { //advanced search
@@ -1141,9 +1141,13 @@ function listViewDataProvider(args, data) {
switch (args.filterBy.search.by) {
case "name":
if (args.filterBy.search.value.length > 0) {
- $.extend(data, {
- keyword: args.filterBy.search.value
- });
+ if (options && options.searchBy) {
+ data[options.searchBy] = args.filterBy.search.value;
+ } else {
+ $.extend(data, {
+ keyword: args.filterBy.search.value
+ });
+ }
}
break;
}
@@ -1156,6 +1160,8 @@ function listViewDataProvider(args, data) {
page: args.page,
pagesize: pageSize
});
+
+ return data;
}
//used by infrastructure page and network page
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/281d8323/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 399fef9..fc1e171 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6997,11 +6997,7 @@
dataProvider: function(args) {
$.ajax({
url: createURL('listConfigurations&zoneid=' + args.context.physicalResources[0].id),
- data: {
- page: args.page,
- pageSize: pageSize,
- listAll: true
- },
+ data: listViewDataProvider(args, {}, { searchBy: 'name' }),
success: function(json) {
args.response.success({
data: json.listconfigurationsresponse.configuration
@@ -12716,11 +12712,7 @@
dataProvider: function(args) {
$.ajax({
url: createURL('listConfigurations&clusterid=' + args.context.clusters[0].id),
- data: {
- page: args.page,
- pageSize: pageSize,
- listAll: true
- },
+ data: listViewDataProvider(args, {}, { searchBy: 'name' }),
success: function(json) {
args.response.success({
data: json.listconfigurationsresponse.configuration
@@ -14934,11 +14926,7 @@
$.ajax({
url: createURL('listConfigurations&storageid=' + args.context.primarystorages[0].id),
- data: {
- page: args.page,
- pageSize: pageSize,
- listAll: true
- },
+ data: listViewDataProvider(args, {}, { searchBy: 'name' }),
success: function(json) {
args.response.success({
data: json.listconfigurationsresponse.configuration