From 6358acff54fdc3926fc70459685d0e9b21c054b4 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 26 Oct 2012 16:10:23 -0700 Subject: [PATCH] cloudstack UI - project page - advanced search - (1) API doesn't take in zoneId, tagKey, tagValue. Therefore, remove the 3 fields from UI. (2) API takes in displayText. Therefore, add this field to UI. --- ui/scripts/projects.js | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js index 4ad032d1be7..34c57c6aae7 100644 --- a/ui/scripts/projects.js +++ b/ui/scripts/projects.js @@ -623,31 +623,9 @@ }, advSearchFields: { - name: { label: 'Name' }, - zoneid: { - label: 'Zone', - select: function(args) { - $.ajax({ - url: createURL('listZones'), - data: { - listAll: true - }, - success: function(json) { - var zones = json.listzonesresponse.zone; - - args.response.success({ - data: $.map(zones, function(zone) { - return { - id: zone.id, - description: zone.name - }; - }) - }); - } - }); - } - }, - + name: { label: 'label.name' }, + displaytext: { label: 'label.display.text' }, + domainid: { label: 'Domain', select: function(args) { @@ -694,9 +672,7 @@ else return true; } - }, - tagKey: { label: 'Tag Key' }, - tagValue: { label: 'Tag Value' } + } }, dataProvider: function(args) {