Updated Branches: refs/heads/4.2 728159375 -> dc19a147f refs/heads/master 5cd8edd44 -> d5b9f2402
Fix missing dataProvider for secondary storage list Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc19a147 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc19a147 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc19a147 Branch: refs/heads/4.2 Commit: dc19a147f1a011d1471d011a266c6effa48b0ef1 Parents: 7281593 Author: Brian Federle <[email protected]> Authored: Tue Aug 13 10:58:17 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Tue Aug 13 10:58:17 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 55 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc19a147/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 3512958..c51bd48 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -14135,35 +14135,34 @@ } }, - /* - dataProvider: function(args) { //being replaced with dataProvider in line 6852 - var array1 = []; - if(args.filterBy != null) { - if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) { - switch(args.filterBy.search.by) { - case "name": - if(args.filterBy.search.value.length > 0) - array1.push("&keyword=" + args.filterBy.search.value); - break; - } - } - } - array1.push("&zoneid=" + args.context.zones[0].id); + + dataProvider: function(args) { + var array1 = []; + if(args.filterBy != null) { + if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) { + switch(args.filterBy.search.by) { + case "name": + if(args.filterBy.search.value.length > 0) + array1.push("&keyword=" + args.filterBy.search.value); + break; + } + } + } + array1.push("&zoneid=" + args.context.zones[0].id); - $.ajax({ - url: createURL("listImageStores&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), - dataType: "json", - async: true, - success: function(json) { - var items = json.listimagestoreresponse.imagestore; - args.response.success({ - actionFilter: secondarystorageActionfilter, - data:items - }); - } - }); - }, - */ + $.ajax({ + url: createURL("listImageStores&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), + dataType: "json", + async: true, + success: function(json) { + var items = json.listimagestoresresponse.imagestore; + args.response.success({ + actionFilter: secondarystorageActionfilter, + data:items + }); + } + }); + }, actions: { add: {
