From b8e87cff000155ea201245ef35d2001194f394cf Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 25 Oct 2012 10:21:45 -0700 Subject: [PATCH] CS-16573: cloudstack UI - Alerts page - basic search - encode data passed to API call. --- ui/scripts/events.js | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/ui/scripts/events.js b/ui/scripts/events.js index 0ff4429f624..38f77284de1 100644 --- a/ui/scripts/events.js +++ b/ui/scripts/events.js @@ -175,20 +175,12 @@ sent: { label: 'label.date', converter: cloudStack.converters.toLocalDate } }, 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; - } - } - } + var data = {}; + listViewDataProvider(args, data); + $.ajax({ - url: createURL("listAlerts&listAll=true&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), - dataType: "json", + url: createURL('listAlerts'), + data: data, async: true, success: function(json) { var items = json.listalertsresponse.alert;