Merge "Enable sorting by size in containers pane"

openstack_dashboard/api/swift.py

@@ -66,7 +66,7 @@ class PseudoFolder(base.APIDictWrapper):
 
     @property
     def bytes(self):
-        return None
+        return 0
 
     @property
     def content_type(self):

openstack_dashboard/dashboards/project/static/dashboard/project/containers/containers.module.js

@@ -98,7 +98,7 @@
         '{$ item.name $}</a><span ng-if="item.is_object">{$ item.name $}</span>'
     })
     .append({
-      id: 'size', priority: 1,
+      id: 'bytes', priority: 1, title: gettext('Size'),
       template: '<span ng-if="item.is_object">{$item.bytes | bytes$}</span>' +
         '<span ng-if="item.is_subdir" translate>Folder</span>'
     });