Revision 0dee4086 snf-cyclades-app/synnefo/ui/static/snf/js/glance_models.js
| b/snf-cyclades-app/synnefo/ui/static/snf/js/glance_models.js | ||
|---|---|---|
| 71 | 71 |
|
| 72 | 72 |
// custom glance api parser |
| 73 | 73 |
parse: function (resp, xhr) {
|
| 74 |
if (_.isArray(resp)) {
|
|
| 75 |
resp = {'images': {'values': resp }};
|
|
| 76 |
} |
|
| 77 | 74 |
return models.GlanceImages.__super__.parse.call(this, resp, xhr); |
| 78 | 75 |
}, |
| 79 | 76 |
|
| 80 | 77 |
_read_image_from_request: function(image, msg, xhr) {
|
| 81 | 78 |
var img = {};
|
| 82 |
img['metadata'] = {values:{}};
|
|
| 79 |
img['metadata'] = {};
|
|
| 83 | 80 |
|
| 84 | 81 |
var headers = snf.util.parseHeaders(xhr.getAllResponseHeaders().toLowerCase()); |
| 85 | 82 |
|
| ... | ... | |
| 91 | 88 |
if (key.indexOf("x-image-meta-property") == -1) {
|
| 92 | 89 |
img[key.replace("x-image-meta-","").replace(/-/g,"_")] = _.trim(value);
|
| 93 | 90 |
} else {
|
| 94 |
img.metadata.values[key.replace('x-image-meta-property-',"").replace(/-/g,"_")] = _.trim(value);
|
|
| 91 |
img.metadata[key.replace('x-image-meta-property-',"").replace(/-/g,"_")] = _.trim(value);
|
|
| 95 | 92 |
} |
| 96 | 93 |
|
| 97 | 94 |
}) |
| ... | ... | |
| 102 | 99 |
parse_meta: function(img) {
|
| 103 | 100 |
if (img.properties) {
|
| 104 | 101 |
img.metadata = {};
|
| 105 |
img.metadata.values = img.properties;
|
|
| 102 |
img.metadata = img.properties; |
|
| 106 | 103 |
} else {
|
| 107 | 104 |
if (!img.metadata) {
|
| 108 |
img.metadata = {values:{}};
|
|
| 105 |
img.metadata = {};
|
|
| 109 | 106 |
} |
| 110 | 107 |
} |
| 111 | 108 |
|
| 112 | 109 |
// fixes plankton regression (returns lowercase meta keys) |
| 113 |
if (img.metadata.values.os && !img.metadata.values.OS) {
|
|
| 114 |
img.metadata.values.OS = img.metadata.values.os;
|
|
| 110 |
if (img.metadata.os && !img.metadata.OS) {
|
|
| 111 |
img.metadata.OS = img.metadata.os;
|
|
| 115 | 112 |
} |
| 116 | 113 |
|
| 117 | 114 |
img = models.GlanceImages.__super__.parse_meta.call(this, img); |
Also available in: Unified diff