Revision ccb14ad0

b/ui/static/snf/js/models.js
152 152

  
153 153
        get_os: function() {
154 154
            return this.get("OS");
155
        },
156

  
157
        get_sort_order: function() {
158
            return parseInt(this.get('metadata') ? this.get('metadata').values.sortorder : -1)
155 159
        }
156 160
    });
157 161

  
......
165 169

  
166 170
        get_disk_size: function() {
167 171
            return parseInt(this.get("disk") * 1000)
168
        },
172
        }
169 173

  
170 174
    });
171 175
    
......
1272 1276
            return undefined;
1273 1277
        },
1274 1278

  
1279
        comparator: function(img) {
1280
            return -img.get_sort_order("sortorder") || 1000 * img.id;
1281
        },
1282

  
1275 1283
        parse_meta: function(img) {
1276 1284
            _.each(this.meta_keys_as_attrs, _.bind(function(key){
1277 1285
                img[key] = this.get_meta_key(img, key);
......
1309 1317
            return resp.flavors.values;
1310 1318
        },
1311 1319

  
1320
        comparator: function(flv) {
1321
            return flv.get("disk") * flv.get("cpu") * flv.get("ram");
1322
        },
1323

  
1312 1324
        unavailable_values_for_image: function(img, flavors) {
1313 1325
            var flavors = flavors || this.active();
1314 1326
            var size = img.get_size();
b/ui/templates/partials/manage_metadata.html
19 19
        </div>
20 20
        <div class="predefined clearfix">
21 21
            <span class="predefined-meta-key">OS</span>
22
            <span class="predefined-meta-key">Location</span>
23 22
            <span class="predefined-meta-key">Owner</span>
24 23
            <span class="predefined-meta-key">Role</span>
25 24
        </div>
b/ui/views.py
52 52
LOGOUT_URL = getattr(settings, "LOGOUT_URL", settings.LOGIN_URL)
53 53
SUGGESTED_FLAVORS = getattr(settings, "SUGGESTED_FLAVORS", {})
54 54
SUGGESTED_ROLES = getattr(settings, "SUGGESTED_ROLES",
55
        ["Database server", "File server", "Mail server", "Web server", "Proxy", "CI server", "Leeching machine"])
55
        ["Database server", "File server", "Mail server", "Web server", "Proxy", "CI server"])
56 56
VM_IMAGE_COMMON_METADATA = getattr(settings, "VM_IMAGE_COMMON_METADATA", ["OS"])
57 57
INVITATIONS_PER_PAGE = getattr(settings, "INVITATIONS_PER_PAGE", 10)
58 58

  

Also available in: Unified diff