Include the element of permissions in bucket-info

leo-project · Jan 9, 2014 · b93e412 · b93e412
1 parent d1053af
commit b93e412
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/lib/bucket_status.rb b/lib/bucket_status.rb
@@ -21,11 +21,12 @@
 #======================================================================
 class LeoCenter
   namespace "/bucket_status" do
+    ## GET
     get "/list.json" do
       begin
         buckets = @@manager.get_buckets
       rescue RuntimeError => ex
-        return { data: [] }.to_json if ex.message == "not found" # empty
+        return { data: [] }.to_json if ex.message == "not found"
         raise ex
       end
 
@@ -35,6 +36,7 @@ class LeoCenter
         {
           name: bucket.name,
           owner: bucket.owner,
+          permissions: bucket.permissions,
           created_at: Integer(bucket.created_at)
         }
       end

diff --git a/lib/buckets.rb b/lib/buckets.rb
@@ -21,27 +21,30 @@
 #======================================================================
 class LeoCenter
   namespace "/buckets" do
+    ## GET
     get "/list.json" do
       check_admin
 
       begin
         buckets = @@manager.get_buckets
       rescue RuntimeError => ex
-        return { data: [] }.to_json if ex.message == "not found" # empty
+        return { data: [] }.to_json if ex.message == "not found"
         raise ex
       end
 
       result = buckets.map do |bucket|
         {
           name: bucket.name,
           owner: bucket.owner,
+          permissions: bucket.permissions,
           created_at: Integer(bucket.created_at)
         }
       end
 
       { data: result }.to_json
     end
 
+    ## POST
     post "/add_bucket" do
       bucket_name = required_params(:bucket)
       access_key = required_sessions(:access_key_id)

diff --git a/public/js/bucket_status_view.js b/public/js/bucket_status_view.js
@@ -47,13 +47,14 @@ function onclick_add_bucket(self) {
 // @doc Setup the status_view
 //
 (function() {
-  Ext.define('LeoCenter.model.BucketStatus', {
-    extend: 'Ext.data.Model',
-    fields: [
-      "name", "owner",
-      { name: "created_at", type: "date", dateFormat: "U" }
-    ]
-  });
+  Ext.define("LeoCenter.model.BucketStatus",
+             { extend: "Ext.data.Model",
+               fields: ["name",
+                        "owner",
+                        "permissions",
+                        { name: "created_at", type: "date", dateFormat: "U" }
+                       ]
+             });
 
   Ext.define(
     PANE_BUCKET_STATUS,
@@ -127,6 +128,11 @@ function onclick_add_bucket(self) {
                                renderer: Ext.htmlEncode,
                                width: 30
                              },
+                             { header: "Permissions",
+                               dataIndex: "permissions",
+                               renderer: Ext.htmlEncode,
+                               width: 30
+                             },
                              { header: "Created at",
                                dataIndex: "created_at",
                                renderer: Ext.util.Format.dateRenderer("c")

diff --git a/public/js/bucket_sub_view.js b/public/js/bucket_sub_view.js
@@ -24,9 +24,10 @@
 (function() {
   Ext.define("LeoCenter.model.Buckets",
              { extend: "Ext.data.Model",
-               fields: [
-                 "name", "owner",
-                 { name: "created_at", type: "date", dateFormat: "U" }
+               fields: ["name",
+                        "owner",
+                        "permissions",
+                        { name: "created_at", type: "date", dateFormat: "U" }
                ]
              });
 
@@ -125,6 +126,11 @@
                         renderer: Ext.util.Format.htmlEncode,
                         width: 30
                       },
+                      { header: "Permissions",
+                        dataIndex: "permissions",
+                        renderer: Ext.util.Format.htmlEncode,
+                        width: 30
+                      },
                       { header: "Created at",
                         dataIndex: "created_at",
                         renderer: Ext.util.Format.dateRenderer("c")