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 2015/01/02 20:21:19 UTC
git commit: updated refs/heads/master to 61154b9
Repository: cloudstack
Updated Branches:
refs/heads/master 25a4f0dc5 -> 61154b92f
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/61154b92
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61154b92
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61154b92
Branch: refs/heads/master
Commit: 61154b92f73ecae5f5622eae53b3f0124a6709d5
Parents: 25a4f0d
Author: Jessica Wang <je...@apache.org>
Authored: Wed Dec 31 16:21:13 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jan 2 11:17:35 2015 -0800
----------------------------------------------------------------------
ui/scripts/configuration.js | 40 ++++------------------------------------
1 file changed, 4 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61154b92/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 76b5b7b..3997e53 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -358,41 +358,9 @@
});
}
},
- 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: _l('hint.type.part.host.tag'),
- noResultsText: _l('hint.no.host.tags')
- });
- },
- 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',
@@ -979,7 +947,7 @@
label: 'label.storage.tags'
},
hosttags: {
- label: 'label.host.tags'
+ label: 'Host Tag'
},
domain: {
label: 'label.domain'