You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/10/29 17:35:40 UTC
git commit: 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.
Updated Branches:
refs/heads/master 802ddd43c -> 6358acff5
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6358acff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6358acff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6358acff
Branch: refs/heads/master
Commit: 6358acff54fdc3926fc70459685d0e9b21c054b4
Parents: 802ddd4
Author: Jessica Wang <je...@citrix.com>
Authored: Fri Oct 26 16:10:23 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Mon Oct 29 09:35:25 2012 -0700
----------------------------------------------------------------------
ui/scripts/projects.js | 32 ++++----------------------------
1 files changed, 4 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6358acff/ui/scripts/projects.js
----------------------------------------------------------------------
diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js
index 4ad032d..34c57c6 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) {