[hybridfox] push by anandchitravelu - Removing out AWS Tagging on 2012-07-12 09:19 GMT
3 views
Skip to first unread message
hybr...@googlecode.com
Jul 12, 2012, 5:19:44 AM7/12/12
to hybr...@googlegroups.com
Revision: 8ee12d6288b5
Author: anandchitravelu
Date: Thu Jul 12 02:19:27 2012
Log: Removing out AWS Tagging
http://code.google.com/p/hybridfox/source/detail?r=8ee12d6288b5
Modified:
/src/chrome/content/ec2ui/amisview.js
/src/chrome/content/ec2ui/attachebsvolumedialog.js
/src/chrome/content/ec2ui/baseimagesview.js
/src/chrome/content/ec2ui/controller.js
/src/chrome/content/ec2ui/instancesview.js
/src/chrome/content/ec2ui/model.js
/src/chrome/content/ec2ui/utils.js
/src/chrome/content/ec2ui/volumesview.js
=======================================
--- /src/chrome/content/ec2ui/amisview.js Thu Feb 23 08:05:04 2012
+++ /src/chrome/content/ec2ui/amisview.js Thu Jul 12 02:19:27 2012
@@ -148,7 +148,6 @@
inst = list[i];
inst.tag = tag;
ec2ui_session.setResourceTag(inst.id, tag);
- tagging2ec2([inst.id], ec2ui_session, tag);
}
}
if (ec2ui_prefs.isRefreshOnChangeEnabled()) {
=======================================
--- /src/chrome/content/ec2ui/attachebsvolumedialog.js Thu Nov 17 04:50:11
2011
+++ /src/chrome/content/ec2ui/attachebsvolumedialog.js Thu Jul 12 02:19:27
2012
@@ -61,7 +61,7 @@
vol.instanceId.length == 0) {
this.volList.push(vol);
label = vol.id;
- name = tagToName(vol.tag);
+ tag = vol.tag;
if (tag && tag.length) {
label = label + ":" + tag;
}
=======================================
--- /src/chrome/content/ec2ui/baseimagesview.js Thu Nov 17 04:50:11 2011
+++ /src/chrome/content/ec2ui/baseimagesview.js Thu Jul 12 02:19:27 2012
@@ -184,7 +184,7 @@
var res = this.getSelectedImage();
if (res) {
- tagEC2Resource(res, ec2ui_session);
+ tagResource(res, ec2ui_session);
this.selectByImageId(res.id);
}
},
=======================================
--- /src/chrome/content/ec2ui/controller.js Wed Jun 6 01:49:04 2012
+++ /src/chrome/content/ec2ui/controller.js Thu Jul 12 02:19:27 2012
@@ -127,7 +127,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeVolumesResponse/ec2:volumeSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -160,11 +159,9 @@
attachTime.setISO8601(getNodeValueByName(items.snapshotItem(i), "attachTime"));
}
list.push(new Volume(id, size, snapshotId, zone, status,
createTime, instanceId, device, attachStatus, attachTime));
-
- this.walkTagSet(items.snapshotItem(i), "volumeId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.volumes, "id");
ec2ui_model.updateVolumes(list);
if (objResponse.callback)
objResponse.callback(list);
@@ -178,7 +175,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeSnapshotsResponse/ec2:snapshotSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -196,11 +192,9 @@
var ownerId =
getNodeValueByName(items.snapshotItem(i), "ownerId")
var ownerAlias =
getNodeValueByName(items.snapshotItem(i), "ownerAlias")
list.push(new Snapshot(id, volumeId, status, startTime,
progress, volumeSize, description, ownerId, ownerAlias));
-
- this.walkTagSet(items.snapshotItem(i), "snapshotId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.snapshots, "id");
ec2ui_model.updateSnapshots(list);
if (objResponse.callback)
objResponse.callback(list);
@@ -217,7 +211,6 @@
onCompleteDescribeVpcs : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeVpcsResponse/ec2:vpcSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -229,11 +222,9 @@
var state = getNodeValueByName(items.snapshotItem(i), "state");
var dhcpopts =
getNodeValueByName(items.snapshotItem(i), "dhcpOptionsId");
list.push(new Vpc(id, cidr, state, dhcpopts));
-
- this.walkTagSet(items.snapshotItem(i), "vpcId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.vpcs, "id");
ec2ui_model.updateVpcs(list);
this.descVpcsInProgress = false;
if (objResponse.callback)
@@ -269,7 +260,6 @@
onCompleteDescribeSubnets : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeSubnetsResponse/ec2:subnetSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -288,11 +278,9 @@
state,
availableIp,
availabilityZone));
-
- this.walkTagSet(items.snapshotItem(i), "subnetId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.subnets, "id");
ec2ui_model.updateSubnets(list);
this.descSubnetsInProgress = false;
if (objResponse.callback)
@@ -328,7 +316,6 @@
onCompleteDescribeDhcpOptions : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeDhcpOptionsResponse/ec2:dhcpOptionsSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -358,11 +345,9 @@
options.push(key + " = " + values.join(","))
}
list.push(new DhcpOptions(id, options.join("; ")));
-
- this.walkTagSet(items.snapshotItem(i), "dhcpOptionsId", tags);
}
- this.addEC2Tag(list,"id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.dhcpOptions, "id");
ec2ui_model.updateDhcpOptions(list);
this.descDhcpOptionsInProgress = false;
if (objResponse.callback)
@@ -420,7 +405,6 @@
onCompleteDescribeVpnGateways : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags =new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeVpnGatewaysResponse/ec2:vpnGatewaySet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -445,11 +429,9 @@
state,
type,
attachments));
-
- this.walkTagSet(items.snapshotItem(i), "vpnGatewayId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.vpnGateways, "id");
ec2ui_model.updateVpnGateways(list);
this.descVpnGatewaysInProgress = false;
if (objResponse.callback)
@@ -485,7 +467,6 @@
onCompleteDescribeCustomerGateways : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeCustomerGatewaysResponse/ec2:customerGatewaySet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -502,11 +483,9 @@
bgpAsn,
state,
type));
-
- this.walkTagSet(items.snapshotItem(i), "customerGatewayId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.customerGateways, "id");
ec2ui_model.updateCustomerGateways(list);
this.descCustomerGatewaysInProgress = false;
if (objResponse.callback)
@@ -547,7 +526,6 @@
xmlDoc.normalize();
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeVpnConnectionsResponse/ec2:vpnConnectionSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -575,11 +553,9 @@
type,
state,
config));
-
- this.walkTagSet(items.snapshotItem(i), "vpnConnectionId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.vpnConnections, "id");
ec2ui_model.updateVpnConnections(list);
this.descVpnConnectionsInProgress = false;
if (objResponse.callback)
@@ -693,7 +669,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var img = null;
var items =
xmlDoc.evaluate("/ec2:DescribeImagesResponse/ec2:imagesSet/ec2:item",
xmlDoc,
@@ -733,11 +708,9 @@
name,
description,
snapshotId));
-
- this.walkTagSet(items.snapshotItem(i), "imageId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.images, "id");
ec2ui_model.updateImages(list);
if (objResponse.callback)
objResponse.callback(list);
@@ -1260,7 +1233,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeInstancesResponse/ec2:reservationSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -1282,21 +1254,12 @@
if (instanceItems) {
var resList = this.unpackReservationInstances(resId,
ownerId, groups, instanceItems);
- list = list.concat(resList);
-
- for (var j = 0; j < instanceItems.length; j++) {
- var instanceItem = instanceItems[j];
-
- if (instanceItem.nodeName == '#text') {
- continue;
- }
-
- this.walkTagSet(instanceItem, "instanceId", tags);
- }
+ list = list.concat(resList);
+
}
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.instances, "id");
ec2ui_model.updateInstances(list);
if (objResponse.callback)
objResponse.callback(list);
@@ -1336,43 +1299,7 @@
objResponse.callback(list);
},
- walkTagSet : function(item, idName, tags) {
- var instanceId = getNodeValueByName(item, idName);
- var tagSet = item.getElementsByTagName("tagSet")[0];
-
- if (tagSet) {
- var tagSetItems = tagSet.getElementsByTagName("item");
- var tagArray = new Array();
- var nameTag = null;
-
- for (var i= 0; i < tagSetItems.length; i++) {
- var tagSetItem = tagSetItems[i];
- var tagSetItemKey = getNodeValueByName(tagSetItem, "key");
- var tagSetItemValue =
getNodeValueByName(tagSetItem, "value");
-
- if (/[,"]/.test(tagSetItemValue)) {
- tagSetItemValue = tagSetItemValue.replace(/"/g, '""');
- tagSetItemValue = '"' + tagSetItemValue + '"';
- }
-
- var keyValue = tagSetItemKey + ":" + tagSetItemValue;
-
- if (tagSetItemKey == "Name") {
- nameTag = keyValue;
- } else {
- tagArray.push(keyValue);
- }
- }
-
- tagArray.sort();
-
- if (nameTag) {
- tagArray.unshift(nameTag);
- }
-
- tags[instanceId] = tagArray.join(", ");
- }
- },
+
addResourceTags : function (list, resourceType, attribute) {
if (!list || list.length == 0) {
@@ -1400,26 +1327,7 @@
ec2ui_session.setResourceTags(resourceType, new_tags);
},
- addEC2Tag : function (list, attribute, tags) {
- if (!list || list.length == 0) {
- return;
- }
-
- if (!tags) {
- return;
- }
-
- var res = null;
- var tag = null;
- for (var i in list) {
- res = list[i];
- tag = tags[res[attribute]];
- if (tag && tag.length) {
- res.tag = tag
- addNameTagToModel(tag, res);
- }
- }
- },
+
describeInstanceAttribute : function (instanceId, attribute, callback) {
var params = new Array();
@@ -2174,7 +2082,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags =new Object();
var items = xmlDoc.getElementsByTagName("item");
for (var i = 0; i < items.length; i++)
{
@@ -2270,73 +2177,5 @@
}
eval("this."+responseObject.requestType+"(responseObject)");
- },
-
- createTags : function (resIds, tags, callback) {
- var params = new Array();
-
- for (var i = 0; i < resIds.length; i++) {
- params.push(["ResourceId." + (i + 1) , resIds[i]]);
- params.push(["Tag." + (i + 1) + ".Key" , tags[i][0]]);
- params.push(["Tag." + (i + 1) + ".Value", tags[i][1]]);
- }
-
- ec2_httpclient.queryEC2("CreateTags", params, this,
true, "onCompleteCreateTags", callback);
- },
-
- onCompleteCreateTags : function (objResponse) {
- if (objResponse.callback) {
- objResponse.callback();
- }
- },
-
- deleteTags : function (resIds, keys, callback) {
- var params = new Array();
-
- for (var i = 0; i < resIds.length; i++) {
- params.push(["ResourceId." + (i + 1), resIds[i]]);
- params.push(["Tag." + (i + 1) + ".Key", keys[i]]);
- }
-
- ec2_httpclient.queryEC2("DeleteTags", params, this,
true, "onCompleteDeleteTags", callback);
- },
-
- onCompleteDeleteTags : function (objResponse) {
- if (objResponse.callback) {
- objResponse.callback();
- }
- },
-
- describeTags : function (resIds, callback) {
- var params = new Array();
-
- for (var i = 0; i < resIds.length; i++) {
- params.push(["Filter." + (i + 1) + ".Name", "resource-id"]);
- params.push(["Filter." + (i + 1) + ".Value.1", resIds[i]]);
- }
-
- ec2_httpclient.queryEC2("DescribeTags", params, this,
true, "onCompleteDescribeTags", callback);
- },
-
- onCompleteDescribeTags : function (objResponse) {
- var xmlDoc = objResponse.xmlDoc;
- var items =
xmlDoc.evaluate("/ec2:DescribeTagsResponse/ec2:tagSet/ec2:item",
- xmlDoc,
- this.getNsResolver(),
- XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
- null);
-
- var tags = new Array();
-
- for (var i = 0; i < items.snapshotLength; ++i) {
- var resid =
getNodeValueByName(items.snapshotItem(i), "resourceId");
- var key = getNodeValueByName(items.snapshotItem(i), "key");
- var value = getNodeValueByName(items.snapshotItem(i), "value");
- tags.push([resid, key, value]);
- }
-
- if (objResponse.callback) {
- objResponse.callback(tags);
- }
- }
+ }
};
=======================================
--- /src/chrome/content/ec2ui/instancesview.js Mon Feb 20 04:02:07 2012
+++ /src/chrome/content/ec2ui/instancesview.js Thu Jul 12 02:19:27 2012
@@ -111,9 +111,9 @@
}
if (instances.length == 1) {
- tagEC2Resource(instances[0], ec2ui_session);
+ tagResource(instances[0], ec2ui_session);
} else {
- ec2ui_utils.tagMultipleEC2Resources(instances, ec2ui_session);
+ ec2ui_utils.tagMultipleResources(instances, ec2ui_session);
}
this.selectByInstanceIds(instances);
=======================================
--- /src/chrome/content/ec2ui/model.js Mon Feb 20 02:54:46 2012
+++ /src/chrome/content/ec2ui/model.js Thu Jul 12 02:19:27 2012
@@ -64,11 +64,7 @@
this.volumeSize = volumeSize;
this.owner = owner;
this.ownerAlias = ownerAlias;
-
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function Volume(id, size, snapshotId, zone, status, createTime,
instanceId, device, attachStatus, attachTime, tag) {
@@ -84,10 +80,8 @@
if (attachStatus != "") {
this.attachTime = attachTime.strftime('%Y-%m-%d %H:%M:%S');
}
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
+
}
function Instance(resId, ownerId, groupList, instanceId, imageId, kernelId,
@@ -120,10 +114,8 @@
this.vpcId = vpcId;
this.subnetId = subnetId;
this.monitoringState = monitoringState;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
+
this.rootDeviceType = rootDeviceType;
}
@@ -218,10 +210,7 @@
this.cidr = cidr;
this.state = state;
this.dhcpOptionsId = dhcpOptionsId;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function Subnet(id, vpcId, cidr, state, availableIp, availabilityZone,
tag) {
@@ -231,19 +220,13 @@
this.state = state;
this.availableIp = availableIp;
this.availabilityZone = availabilityZone;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function DhcpOptions(id, options, tag) {
this.id = id;
this.options = options;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function VpnConnection(id, vgwId, cgwId, type, state, config, attachments,
tag) {
@@ -255,10 +238,7 @@
this.config = config;
this.attachments = attachments;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function VpnGateway(id, availabilityZone, state, type, attachments, tag) {
@@ -268,10 +248,7 @@
this.type = type;
this.attachments = attachments;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function VpnGatewayAttachment(vpcId, vgwId, state) {
@@ -287,10 +264,7 @@
this.state = state;
this.type = type;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
String.prototype.trim = function() {
=======================================
--- /src/chrome/content/ec2ui/utils.js Thu Nov 17 04:50:11 2011
+++ /src/chrome/content/ec2ui/utils.js Thu Jul 12 02:19:27 2012
@@ -302,95 +302,6 @@
res.tag = tag.trim();
session.setResourceTag(res[attr], res.tag);
}
-
-function tagPrompt(tag) {
- var returnValue = {accepted:false , result:null};
-
- openDialog('chrome://ec2ui/content/dialog_tag.xul',
- null,
- 'chrome,centerscreen,modal,width=400,height=250',
- tag,
- returnValue);
-
- return returnValue.accepted ? (returnValue.result || '').trim() : null;
-}
-
-function tagEC2Resource(res, session, attr) {
- if (!attr) attr = "id";
-
- var tag = tagPrompt(res.tag);
-
- if (tag == null)
- return;
-
- tag = tag.trim();
- res.tag = tag;
- addNameTagToModel(tag, res);
- session.setResourceTag(res[attr], res.tag);
-
- tagging2ec2([res[attr]], session, tag);
-}
-
-function tagging2ec2(resIds, session, tagString, disableDeleteTags) {
- var multiIds = new Array();
- var multiTags = new Array();
-
- try {
- var tags = new Array();
- tagString += ',';
- var keyValues = (tagString.match(/\s*[^,":]+\s*:\s*("(?:[^"]|"")*"|
[^,]*)\s*,\s*/g) || []);
-
- for (var i = 0; i < keyValues.length; i++) {
- var kv = keyValues[i].split(/\s*:\s*/, 2);
- var key = (kv[0] || "").trim();
- var value = (kv[1] || "").trim();
- value = value.replace(/,\s*$/, '').trim();
- value =
value.replace(/^"/, '').replace(/"$/, '').replace(/""/, '"');
-
- if (key.length == 0 || value.length == 0) {
- continue;
- }
-
- tags.push([key, value]);
- }
-
- for (var i = 0; i < resIds.length; i++) {
- var resId = resIds[i];
-
- for (var j = 0; j < tags.length; j++) {
- multiIds.push(resId);
- }
-
- multiTags = multiTags.concat(tags);
- }
-
- if (multiIds.length == 0) {
- multiIds = resIds;
- }
-
- session.controller.describeTags(resIds, function(described) {
- var delResIds = new Array();
- var delKyes = new Array();
-
- for (var i = 0; i < described.length; i++) {
- delResIds.push(described[i][0]);
- delKyes.push(described[i][1]);
- }
-
- if (!disableDeleteTags) {
- if (delResIds.length > 0 && delKyes.length > 0) {
- session.controller.deleteTags(delResIds, delKyes);
- }
- }
-
- if (multiTags.length > 0) {
- session.controller.createTags(multiIds, multiTags);
- }
- });
- } catch (e) {
- alert(e);
- }
-}
function parseHeaders(headers) {
var headerArr = new Array();
@@ -438,78 +349,6 @@
dur = dur/(365);
return dur.toString();
}
-
-function addNameTagToModel(tag, model) {
- var kvs = tag.split(/\s*,\s*/);
-
- for (var i = 0; i < kvs.length; i++) {
- var kv = kvs[i].split(/\s*:\s*/, 2);
- var key = kv[0].trim();
- var value = (kv[1] || "").trim();
-
- if (key == "Name") {
- model.name = value;
- return;
- }
- }
-
- model.name = null;
-}
-
-function tagToName(tag) {
- var kvs = (tag || '').split(/\s*,\s*/);
-
- for (var i = 0; i < kvs.length; i++) {
- var kv = kvs[i].split(/\s*:\s*/, 2);
- var key = kv[0].trim();
- var value = (kv[1] || "").trim();
-
- if (key == "Name") {
- return value;
- }
- }
-
- return null;
-}
-
-function concatTags(a, b) {
- if (!a) { a = ""; }
- if (!b) { b = ""; }
-
- function putTagsToHash(tagString, hash) {
- tagString += ',';
- var kvs = (tagString.match(/\s*[^,":]+\s*:\s*("(?:[^"]|"")*"|
[^,]*)\s*,\s*/g) || []);
-
- for (var i = 0; i < kvs.length; i++) {
- var kv = kvs[i].split(/\s*:\s*/, 2);
- var key = kv[0].trim();
- var value = (kv[1] || "").trim();
- value = value.replace(/,\s*$/, '').trim();
- value =
value.replace(/^"/, '').replace(/"$/, '').replace(/""/, '"');
-
- if (key && value) {
- if (/[,"]/.test(value)) {
- value = value.replace(/"/g, '""');
- value = '"' + value + '"';
- }
-
- hash[key] = value;
- }
- }
- }
-
- var tags = new Object();
- var tagArray = new Array();
-
- putTagsToHash(a, tags);
- putTagsToHash(b, tags);
-
- for (var i in tags) {
- tagArray.push(i + ":" + tags[i]);
- }
-
- return tagArray.join(", ");
-}
var protPortMap = {
ssh : "22",
@@ -568,8 +407,8 @@
if (!attr) {
attr = "id";
}
-
- var tag = tagPrompt(list[0].tag);
+ var msg =
this.getMessageProperty("ec2ui.msg.util.tag.prompt.multiple", [
list[0][attr] ] );
+ var tag = prompt(msg, list[0].tag || "");
if (tag == null) return;
@@ -582,31 +421,7 @@
}
},
- tagMultipleEC2Resources : function(list, session, attr) {
- if (!list || !session) return;
-
- if (!attr) {
- attr = "id";
- }
-
- var tag = tagPrompt(list[0].tag);
-
- if (!tag) return;
-
- var res = null;
- tag = tag.trim();
- var resIds = new Array();
- for (var i = 0; i < list.length; ++i) {
- res = list[i];
- res.tag = concatTags(res.tag, tag);
- addNameTagToModel(res.tag, res);
- session.setResourceTag(res[attr], res.tag);
- resIds.push(res[attr]);
- }
-
- tagging2ec2(resIds, session, tag, true);
- },
-
+
winRegex : new RegExp(/^Windows/i),
macRegex : new RegExp(/^Mac/),
=======================================
--- /src/chrome/content/ec2ui/volumesview.js Thu Nov 17 04:50:11 2011
+++ /src/chrome/content/ec2ui/volumesview.js Thu Jul 12 02:19:27 2012
@@ -138,12 +138,9 @@
if (vol) {
vol.tag = retVal.tag;
ec2ui_session.setResourceTag(vol.id, vol.tag);
- tagging2ec2([vol.id], ec2ui_session, vol.tag);
- me.refresh();
}
}
}
-
return retVal.ok;
},
Author: anandchitravelu
Date: Thu Jul 12 02:19:27 2012
Log: Removing out AWS Tagging
http://code.google.com/p/hybridfox/source/detail?r=8ee12d6288b5
Modified:
/src/chrome/content/ec2ui/amisview.js
/src/chrome/content/ec2ui/attachebsvolumedialog.js
/src/chrome/content/ec2ui/baseimagesview.js
/src/chrome/content/ec2ui/controller.js
/src/chrome/content/ec2ui/instancesview.js
/src/chrome/content/ec2ui/model.js
/src/chrome/content/ec2ui/utils.js
/src/chrome/content/ec2ui/volumesview.js
=======================================
--- /src/chrome/content/ec2ui/amisview.js Thu Feb 23 08:05:04 2012
+++ /src/chrome/content/ec2ui/amisview.js Thu Jul 12 02:19:27 2012
@@ -148,7 +148,6 @@
inst = list[i];
inst.tag = tag;
ec2ui_session.setResourceTag(inst.id, tag);
- tagging2ec2([inst.id], ec2ui_session, tag);
}
}
if (ec2ui_prefs.isRefreshOnChangeEnabled()) {
=======================================
--- /src/chrome/content/ec2ui/attachebsvolumedialog.js Thu Nov 17 04:50:11
2011
+++ /src/chrome/content/ec2ui/attachebsvolumedialog.js Thu Jul 12 02:19:27
2012
@@ -61,7 +61,7 @@
vol.instanceId.length == 0) {
this.volList.push(vol);
label = vol.id;
- name = tagToName(vol.tag);
+ tag = vol.tag;
if (tag && tag.length) {
label = label + ":" + tag;
}
=======================================
--- /src/chrome/content/ec2ui/baseimagesview.js Thu Nov 17 04:50:11 2011
+++ /src/chrome/content/ec2ui/baseimagesview.js Thu Jul 12 02:19:27 2012
@@ -184,7 +184,7 @@
var res = this.getSelectedImage();
if (res) {
- tagEC2Resource(res, ec2ui_session);
+ tagResource(res, ec2ui_session);
this.selectByImageId(res.id);
}
},
=======================================
--- /src/chrome/content/ec2ui/controller.js Wed Jun 6 01:49:04 2012
+++ /src/chrome/content/ec2ui/controller.js Thu Jul 12 02:19:27 2012
@@ -127,7 +127,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeVolumesResponse/ec2:volumeSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -160,11 +159,9 @@
attachTime.setISO8601(getNodeValueByName(items.snapshotItem(i), "attachTime"));
}
list.push(new Volume(id, size, snapshotId, zone, status,
createTime, instanceId, device, attachStatus, attachTime));
-
- this.walkTagSet(items.snapshotItem(i), "volumeId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.volumes, "id");
ec2ui_model.updateVolumes(list);
if (objResponse.callback)
objResponse.callback(list);
@@ -178,7 +175,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeSnapshotsResponse/ec2:snapshotSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -196,11 +192,9 @@
var ownerId =
getNodeValueByName(items.snapshotItem(i), "ownerId")
var ownerAlias =
getNodeValueByName(items.snapshotItem(i), "ownerAlias")
list.push(new Snapshot(id, volumeId, status, startTime,
progress, volumeSize, description, ownerId, ownerAlias));
-
- this.walkTagSet(items.snapshotItem(i), "snapshotId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.snapshots, "id");
ec2ui_model.updateSnapshots(list);
if (objResponse.callback)
objResponse.callback(list);
@@ -217,7 +211,6 @@
onCompleteDescribeVpcs : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeVpcsResponse/ec2:vpcSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -229,11 +222,9 @@
var state = getNodeValueByName(items.snapshotItem(i), "state");
var dhcpopts =
getNodeValueByName(items.snapshotItem(i), "dhcpOptionsId");
list.push(new Vpc(id, cidr, state, dhcpopts));
-
- this.walkTagSet(items.snapshotItem(i), "vpcId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.vpcs, "id");
ec2ui_model.updateVpcs(list);
this.descVpcsInProgress = false;
if (objResponse.callback)
@@ -269,7 +260,6 @@
onCompleteDescribeSubnets : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeSubnetsResponse/ec2:subnetSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -288,11 +278,9 @@
state,
availableIp,
availabilityZone));
-
- this.walkTagSet(items.snapshotItem(i), "subnetId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.subnets, "id");
ec2ui_model.updateSubnets(list);
this.descSubnetsInProgress = false;
if (objResponse.callback)
@@ -328,7 +316,6 @@
onCompleteDescribeDhcpOptions : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeDhcpOptionsResponse/ec2:dhcpOptionsSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -358,11 +345,9 @@
options.push(key + " = " + values.join(","))
}
list.push(new DhcpOptions(id, options.join("; ")));
-
- this.walkTagSet(items.snapshotItem(i), "dhcpOptionsId", tags);
}
- this.addEC2Tag(list,"id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.dhcpOptions, "id");
ec2ui_model.updateDhcpOptions(list);
this.descDhcpOptionsInProgress = false;
if (objResponse.callback)
@@ -420,7 +405,6 @@
onCompleteDescribeVpnGateways : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags =new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeVpnGatewaysResponse/ec2:vpnGatewaySet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -445,11 +429,9 @@
state,
type,
attachments));
-
- this.walkTagSet(items.snapshotItem(i), "vpnGatewayId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.vpnGateways, "id");
ec2ui_model.updateVpnGateways(list);
this.descVpnGatewaysInProgress = false;
if (objResponse.callback)
@@ -485,7 +467,6 @@
onCompleteDescribeCustomerGateways : function (objResponse) {
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeCustomerGatewaysResponse/ec2:customerGatewaySet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -502,11 +483,9 @@
bgpAsn,
state,
type));
-
- this.walkTagSet(items.snapshotItem(i), "customerGatewayId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.customerGateways, "id");
ec2ui_model.updateCustomerGateways(list);
this.descCustomerGatewaysInProgress = false;
if (objResponse.callback)
@@ -547,7 +526,6 @@
xmlDoc.normalize();
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeVpnConnectionsResponse/ec2:vpnConnectionSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -575,11 +553,9 @@
type,
state,
config));
-
- this.walkTagSet(items.snapshotItem(i), "vpnConnectionId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.vpnConnections, "id");
ec2ui_model.updateVpnConnections(list);
this.descVpnConnectionsInProgress = false;
if (objResponse.callback)
@@ -693,7 +669,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var img = null;
var items =
xmlDoc.evaluate("/ec2:DescribeImagesResponse/ec2:imagesSet/ec2:item",
xmlDoc,
@@ -733,11 +708,9 @@
name,
description,
snapshotId));
-
- this.walkTagSet(items.snapshotItem(i), "imageId", tags);
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.images, "id");
ec2ui_model.updateImages(list);
if (objResponse.callback)
objResponse.callback(list);
@@ -1260,7 +1233,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags = new Object();
var items =
xmlDoc.evaluate("/ec2:DescribeInstancesResponse/ec2:reservationSet/ec2:item",
xmlDoc,
this.getNsResolver(),
@@ -1282,21 +1254,12 @@
if (instanceItems) {
var resList = this.unpackReservationInstances(resId,
ownerId, groups, instanceItems);
- list = list.concat(resList);
-
- for (var j = 0; j < instanceItems.length; j++) {
- var instanceItem = instanceItems[j];
-
- if (instanceItem.nodeName == '#text') {
- continue;
- }
-
- this.walkTagSet(instanceItem, "instanceId", tags);
- }
+ list = list.concat(resList);
+
}
}
- this.addEC2Tag(list, "id", tags);
+ this.addResourceTags(list,
ec2ui_session.model.resourceMap.instances, "id");
ec2ui_model.updateInstances(list);
if (objResponse.callback)
objResponse.callback(list);
@@ -1336,43 +1299,7 @@
objResponse.callback(list);
},
- walkTagSet : function(item, idName, tags) {
- var instanceId = getNodeValueByName(item, idName);
- var tagSet = item.getElementsByTagName("tagSet")[0];
-
- if (tagSet) {
- var tagSetItems = tagSet.getElementsByTagName("item");
- var tagArray = new Array();
- var nameTag = null;
-
- for (var i= 0; i < tagSetItems.length; i++) {
- var tagSetItem = tagSetItems[i];
- var tagSetItemKey = getNodeValueByName(tagSetItem, "key");
- var tagSetItemValue =
getNodeValueByName(tagSetItem, "value");
-
- if (/[,"]/.test(tagSetItemValue)) {
- tagSetItemValue = tagSetItemValue.replace(/"/g, '""');
- tagSetItemValue = '"' + tagSetItemValue + '"';
- }
-
- var keyValue = tagSetItemKey + ":" + tagSetItemValue;
-
- if (tagSetItemKey == "Name") {
- nameTag = keyValue;
- } else {
- tagArray.push(keyValue);
- }
- }
-
- tagArray.sort();
-
- if (nameTag) {
- tagArray.unshift(nameTag);
- }
-
- tags[instanceId] = tagArray.join(", ");
- }
- },
+
addResourceTags : function (list, resourceType, attribute) {
if (!list || list.length == 0) {
@@ -1400,26 +1327,7 @@
ec2ui_session.setResourceTags(resourceType, new_tags);
},
- addEC2Tag : function (list, attribute, tags) {
- if (!list || list.length == 0) {
- return;
- }
-
- if (!tags) {
- return;
- }
-
- var res = null;
- var tag = null;
- for (var i in list) {
- res = list[i];
- tag = tags[res[attribute]];
- if (tag && tag.length) {
- res.tag = tag
- addNameTagToModel(tag, res);
- }
- }
- },
+
describeInstanceAttribute : function (instanceId, attribute, callback) {
var params = new Array();
@@ -2174,7 +2082,6 @@
var xmlDoc = objResponse.xmlDoc;
var list = new Array();
- var tags =new Object();
var items = xmlDoc.getElementsByTagName("item");
for (var i = 0; i < items.length; i++)
{
@@ -2270,73 +2177,5 @@
}
eval("this."+responseObject.requestType+"(responseObject)");
- },
-
- createTags : function (resIds, tags, callback) {
- var params = new Array();
-
- for (var i = 0; i < resIds.length; i++) {
- params.push(["ResourceId." + (i + 1) , resIds[i]]);
- params.push(["Tag." + (i + 1) + ".Key" , tags[i][0]]);
- params.push(["Tag." + (i + 1) + ".Value", tags[i][1]]);
- }
-
- ec2_httpclient.queryEC2("CreateTags", params, this,
true, "onCompleteCreateTags", callback);
- },
-
- onCompleteCreateTags : function (objResponse) {
- if (objResponse.callback) {
- objResponse.callback();
- }
- },
-
- deleteTags : function (resIds, keys, callback) {
- var params = new Array();
-
- for (var i = 0; i < resIds.length; i++) {
- params.push(["ResourceId." + (i + 1), resIds[i]]);
- params.push(["Tag." + (i + 1) + ".Key", keys[i]]);
- }
-
- ec2_httpclient.queryEC2("DeleteTags", params, this,
true, "onCompleteDeleteTags", callback);
- },
-
- onCompleteDeleteTags : function (objResponse) {
- if (objResponse.callback) {
- objResponse.callback();
- }
- },
-
- describeTags : function (resIds, callback) {
- var params = new Array();
-
- for (var i = 0; i < resIds.length; i++) {
- params.push(["Filter." + (i + 1) + ".Name", "resource-id"]);
- params.push(["Filter." + (i + 1) + ".Value.1", resIds[i]]);
- }
-
- ec2_httpclient.queryEC2("DescribeTags", params, this,
true, "onCompleteDescribeTags", callback);
- },
-
- onCompleteDescribeTags : function (objResponse) {
- var xmlDoc = objResponse.xmlDoc;
- var items =
xmlDoc.evaluate("/ec2:DescribeTagsResponse/ec2:tagSet/ec2:item",
- xmlDoc,
- this.getNsResolver(),
- XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,
- null);
-
- var tags = new Array();
-
- for (var i = 0; i < items.snapshotLength; ++i) {
- var resid =
getNodeValueByName(items.snapshotItem(i), "resourceId");
- var key = getNodeValueByName(items.snapshotItem(i), "key");
- var value = getNodeValueByName(items.snapshotItem(i), "value");
- tags.push([resid, key, value]);
- }
-
- if (objResponse.callback) {
- objResponse.callback(tags);
- }
- }
+ }
};
=======================================
--- /src/chrome/content/ec2ui/instancesview.js Mon Feb 20 04:02:07 2012
+++ /src/chrome/content/ec2ui/instancesview.js Thu Jul 12 02:19:27 2012
@@ -111,9 +111,9 @@
}
if (instances.length == 1) {
- tagEC2Resource(instances[0], ec2ui_session);
+ tagResource(instances[0], ec2ui_session);
} else {
- ec2ui_utils.tagMultipleEC2Resources(instances, ec2ui_session);
+ ec2ui_utils.tagMultipleResources(instances, ec2ui_session);
}
this.selectByInstanceIds(instances);
=======================================
--- /src/chrome/content/ec2ui/model.js Mon Feb 20 02:54:46 2012
+++ /src/chrome/content/ec2ui/model.js Thu Jul 12 02:19:27 2012
@@ -64,11 +64,7 @@
this.volumeSize = volumeSize;
this.owner = owner;
this.ownerAlias = ownerAlias;
-
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function Volume(id, size, snapshotId, zone, status, createTime,
instanceId, device, attachStatus, attachTime, tag) {
@@ -84,10 +80,8 @@
if (attachStatus != "") {
this.attachTime = attachTime.strftime('%Y-%m-%d %H:%M:%S');
}
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
+
}
function Instance(resId, ownerId, groupList, instanceId, imageId, kernelId,
@@ -120,10 +114,8 @@
this.vpcId = vpcId;
this.subnetId = subnetId;
this.monitoringState = monitoringState;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
+
this.rootDeviceType = rootDeviceType;
}
@@ -218,10 +210,7 @@
this.cidr = cidr;
this.state = state;
this.dhcpOptionsId = dhcpOptionsId;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function Subnet(id, vpcId, cidr, state, availableIp, availabilityZone,
tag) {
@@ -231,19 +220,13 @@
this.state = state;
this.availableIp = availableIp;
this.availabilityZone = availabilityZone;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function DhcpOptions(id, options, tag) {
this.id = id;
this.options = options;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function VpnConnection(id, vgwId, cgwId, type, state, config, attachments,
tag) {
@@ -255,10 +238,7 @@
this.config = config;
this.attachments = attachments;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function VpnGateway(id, availabilityZone, state, type, attachments, tag) {
@@ -268,10 +248,7 @@
this.type = type;
this.attachments = attachments;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
function VpnGatewayAttachment(vpcId, vgwId, state) {
@@ -287,10 +264,7 @@
this.state = state;
this.type = type;
- if (tag) {
- this.tag = tag;
- addNameTagToModel(tag, this);
- }
+ if (tag) this.tag = tag;
}
String.prototype.trim = function() {
=======================================
--- /src/chrome/content/ec2ui/utils.js Thu Nov 17 04:50:11 2011
+++ /src/chrome/content/ec2ui/utils.js Thu Jul 12 02:19:27 2012
@@ -302,95 +302,6 @@
res.tag = tag.trim();
session.setResourceTag(res[attr], res.tag);
}
-
-function tagPrompt(tag) {
- var returnValue = {accepted:false , result:null};
-
- openDialog('chrome://ec2ui/content/dialog_tag.xul',
- null,
- 'chrome,centerscreen,modal,width=400,height=250',
- tag,
- returnValue);
-
- return returnValue.accepted ? (returnValue.result || '').trim() : null;
-}
-
-function tagEC2Resource(res, session, attr) {
- if (!attr) attr = "id";
-
- var tag = tagPrompt(res.tag);
-
- if (tag == null)
- return;
-
- tag = tag.trim();
- res.tag = tag;
- addNameTagToModel(tag, res);
- session.setResourceTag(res[attr], res.tag);
-
- tagging2ec2([res[attr]], session, tag);
-}
-
-function tagging2ec2(resIds, session, tagString, disableDeleteTags) {
- var multiIds = new Array();
- var multiTags = new Array();
-
- try {
- var tags = new Array();
- tagString += ',';
- var keyValues = (tagString.match(/\s*[^,":]+\s*:\s*("(?:[^"]|"")*"|
[^,]*)\s*,\s*/g) || []);
-
- for (var i = 0; i < keyValues.length; i++) {
- var kv = keyValues[i].split(/\s*:\s*/, 2);
- var key = (kv[0] || "").trim();
- var value = (kv[1] || "").trim();
- value = value.replace(/,\s*$/, '').trim();
- value =
value.replace(/^"/, '').replace(/"$/, '').replace(/""/, '"');
-
- if (key.length == 0 || value.length == 0) {
- continue;
- }
-
- tags.push([key, value]);
- }
-
- for (var i = 0; i < resIds.length; i++) {
- var resId = resIds[i];
-
- for (var j = 0; j < tags.length; j++) {
- multiIds.push(resId);
- }
-
- multiTags = multiTags.concat(tags);
- }
-
- if (multiIds.length == 0) {
- multiIds = resIds;
- }
-
- session.controller.describeTags(resIds, function(described) {
- var delResIds = new Array();
- var delKyes = new Array();
-
- for (var i = 0; i < described.length; i++) {
- delResIds.push(described[i][0]);
- delKyes.push(described[i][1]);
- }
-
- if (!disableDeleteTags) {
- if (delResIds.length > 0 && delKyes.length > 0) {
- session.controller.deleteTags(delResIds, delKyes);
- }
- }
-
- if (multiTags.length > 0) {
- session.controller.createTags(multiIds, multiTags);
- }
- });
- } catch (e) {
- alert(e);
- }
-}
function parseHeaders(headers) {
var headerArr = new Array();
@@ -438,78 +349,6 @@
dur = dur/(365);
return dur.toString();
}
-
-function addNameTagToModel(tag, model) {
- var kvs = tag.split(/\s*,\s*/);
-
- for (var i = 0; i < kvs.length; i++) {
- var kv = kvs[i].split(/\s*:\s*/, 2);
- var key = kv[0].trim();
- var value = (kv[1] || "").trim();
-
- if (key == "Name") {
- model.name = value;
- return;
- }
- }
-
- model.name = null;
-}
-
-function tagToName(tag) {
- var kvs = (tag || '').split(/\s*,\s*/);
-
- for (var i = 0; i < kvs.length; i++) {
- var kv = kvs[i].split(/\s*:\s*/, 2);
- var key = kv[0].trim();
- var value = (kv[1] || "").trim();
-
- if (key == "Name") {
- return value;
- }
- }
-
- return null;
-}
-
-function concatTags(a, b) {
- if (!a) { a = ""; }
- if (!b) { b = ""; }
-
- function putTagsToHash(tagString, hash) {
- tagString += ',';
- var kvs = (tagString.match(/\s*[^,":]+\s*:\s*("(?:[^"]|"")*"|
[^,]*)\s*,\s*/g) || []);
-
- for (var i = 0; i < kvs.length; i++) {
- var kv = kvs[i].split(/\s*:\s*/, 2);
- var key = kv[0].trim();
- var value = (kv[1] || "").trim();
- value = value.replace(/,\s*$/, '').trim();
- value =
value.replace(/^"/, '').replace(/"$/, '').replace(/""/, '"');
-
- if (key && value) {
- if (/[,"]/.test(value)) {
- value = value.replace(/"/g, '""');
- value = '"' + value + '"';
- }
-
- hash[key] = value;
- }
- }
- }
-
- var tags = new Object();
- var tagArray = new Array();
-
- putTagsToHash(a, tags);
- putTagsToHash(b, tags);
-
- for (var i in tags) {
- tagArray.push(i + ":" + tags[i]);
- }
-
- return tagArray.join(", ");
-}
var protPortMap = {
ssh : "22",
@@ -568,8 +407,8 @@
if (!attr) {
attr = "id";
}
-
- var tag = tagPrompt(list[0].tag);
+ var msg =
this.getMessageProperty("ec2ui.msg.util.tag.prompt.multiple", [
list[0][attr] ] );
+ var tag = prompt(msg, list[0].tag || "");
if (tag == null) return;
@@ -582,31 +421,7 @@
}
},
- tagMultipleEC2Resources : function(list, session, attr) {
- if (!list || !session) return;
-
- if (!attr) {
- attr = "id";
- }
-
- var tag = tagPrompt(list[0].tag);
-
- if (!tag) return;
-
- var res = null;
- tag = tag.trim();
- var resIds = new Array();
- for (var i = 0; i < list.length; ++i) {
- res = list[i];
- res.tag = concatTags(res.tag, tag);
- addNameTagToModel(res.tag, res);
- session.setResourceTag(res[attr], res.tag);
- resIds.push(res[attr]);
- }
-
- tagging2ec2(resIds, session, tag, true);
- },
-
+
winRegex : new RegExp(/^Windows/i),
macRegex : new RegExp(/^Mac/),
=======================================
--- /src/chrome/content/ec2ui/volumesview.js Thu Nov 17 04:50:11 2011
+++ /src/chrome/content/ec2ui/volumesview.js Thu Jul 12 02:19:27 2012
@@ -138,12 +138,9 @@
if (vol) {
vol.tag = retVal.tag;
ec2ui_session.setResourceTag(vol.id, vol.tag);
- tagging2ec2([vol.id], ec2ui_session, vol.tag);
- me.refresh();
}
}
}
-
return retVal.ok;
},
Reply all
Reply to author
Forward
0 new messages