cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.5 to 85e88e9
Date Thu, 01 Jan 2015 00:22:20 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 94237a4c5 -> 85e88e9cb


CLOUDSTACK-8139: UI > create compute offering > server-side only supports one single
host tag instead of multiple host tags. So, change UI to take in only one single host tag
instead of multiple host tags in create compute dialog.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85e88e9c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85e88e9c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85e88e9c

Branch: refs/heads/4.5
Commit: 85e88e9cbcba913fd9848e1daa42e21259c02a96
Parents: 94237a4
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Dec 31 16:21:13 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Wed Dec 31 16:21:13 2014 -0800

----------------------------------------------------------------------
 ui/scripts/configuration.js | 42 +++++-----------------------------------
 1 file changed, 5 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e88e9c/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 6468d22..da01b4b 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -339,42 +339,10 @@
                                             });
                                         }
                                     },
-                                    hostTags: {
-                                        label: 'label.host.tags',
-                                        docID: 'helpComputeOfferingHostTags',
-                                        isTokenInput: true,
-                                        dataProvider: function(args) {
-                                            $.ajax({
-                                                url: createURL("listHostTags"),
-                                                dataType: "json",
-                                                success: function(json) {
-                                                    var item = json.listhosttagsresponse.hosttag;
-                                                    var tags = [];
-
-                                                    if (item != null)
-                                                    {
-                                                        tags = $.map(item, function(tag)
{
-                                                            return {
-                                                                       id: tag.name,
-                                                                       name: tag.name
-                                                                   };
-                                                        });
-                                                    }
-
-                                                    args.response.success({
-                                                        data: tags,
-                                                        hintText: "Type in part of a host
tag",
-                                                        noResultsText: "No host tags found"
-                                                    });
-                                                },
-                                                error: function(XMLHttpResponse) {
-                                                    var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
-
-                                                    args.response.error(errorMsg);
-                                                }
-                                            });
-                                        }
-                                    },
+                                    hostTags: { //Only one single host tag is supported at
server-side. Multiple host tags are NOT supported at server-side.
+                                        label: 'Host Tag',
+                                        docID: 'helpComputeOfferingHostTags'            
                           
+                                   },
                                     cpuCap: {
                                         label: 'label.CPU.cap',
                                         isBoolean: true,
@@ -958,7 +926,7 @@
                                         label: 'label.storage.tags'
                                     },
                                     hosttags: {
-                                        label: 'label.host.tags'
+                                        label: 'Host Tag'
                                     },
                                     domain: {
                                         label: 'label.domain'


Mime
View raw message