[ARVADOS] updated: 7a82503a45c632918f8f032913dbbf6711a02e2e

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/folders_controller.rb          | 11 +++++++---
 apps/workbench/app/views/folders/_choose.html.erb  | 25 ++++++++++++++--------
 .../app/views/folders/_show_folders.html.erb       | 24 +++++++++++++--------
 3 files changed, 39 insertions(+), 21 deletions(-)

       via  7a82503a45c632918f8f032913dbbf6711a02e2e (commit)
      from  c95e2762749ac2eb98fd7aec45134549174213d8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7a82503a45c632918f8f032913dbbf6711a02e2e
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 23 17:01:08 2014 -0400

    2760: Use "My Folders" to indicate the root of my folder hierarchy.

diff --git a/apps/workbench/app/controllers/folders_controller.rb b/apps/workbench/app/controllers/folders_controller.rb
index 94689ac..8ebb1a3 100644
--- a/apps/workbench/app/controllers/folders_controller.rb
+++ b/apps/workbench/app/controllers/folders_controller.rb
@@ -61,14 +61,19 @@ class FoldersController < ApplicationController
     end
     sorted_paths = lambda do |tree, depth=0|
       paths = []
-      tree.keys.sort_by { |ob| ob.friendly_link_name }.each do |ob|
+      tree.keys.sort_by { |ob|
+        ob.is_a?(String) ? ob : ob.friendly_link_name
+      }.each do |ob|
         paths << {object: ob, depth: depth}
         paths += sorted_paths.call tree[ob], depth+1
       end
       paths
     end
-    @my_folder_tree = sorted_paths.call buildtree.call(children_of, 'me')
-    @shared_folder_tree = sorted_paths.call buildtree.call(children_of, false)
+    @my_folder_tree =
+      sorted_paths.call buildtree.call(children_of, 'me')
+    @shared_folder_tree =
+      sorted_paths.call({'Shared with me' =>
+                          buildtree.call(children_of, false)})
   end
 
   def choose
diff --git a/apps/workbench/app/views/folders/_choose.html.erb b/apps/workbench/app/views/folders/_choose.html.erb
index d0fa73b..112739e 100644
--- a/apps/workbench/app/views/folders/_choose.html.erb
+++ b/apps/workbench/app/views/folders/_choose.html.erb
@@ -9,16 +9,23 @@
 
       <div class="modal-body">
         <div class="container-fluid arv-folder-list selectable-container" style="height: 15em; overflow-y: scroll">
-          <% [[@my_folder_tree, 'My folders'],
-             [@shared_folder_tree, 'Shared with me']].each do |tree, label| %>
-            <div class="row">
-              <i class="fa fa-fw fa-folder-open-o"></i> <%= label %>
-            </div>
+          <% [@my_folder_tree, @shared_folder_tree].each do |tree| %>
             <% tree.each do |foldernode| %>
-              <div class="<%= 'selectable' if !params[:editable] || foldernode[:object].editable? %> folder row" style="padding-left: <%= 1 + foldernode[:depth] %>em;" data-object-uuid="<%= foldernode[:object].uuid %>">
-                <i class="fa fa-fw fa-folder-o"></i>
-                <%= foldernode[:object].friendly_link_name || 'New folder' %>
-              </div>
+              <% if foldernode[:object].is_a? String %>
+                <div class="folder row" style="padding-left: <%= 1 + foldernode[:depth] %>em;">
+                  <i class="fa fa-fw fa-folder-open-o"></i>
+                  <%= foldernode[:object] %>
+                </div>
+              <% else %>
+                <div class="<%= 'selectable' if !params[:editable] || foldernode[:object].editable? %> folder row" style="padding-left: <%= 1 + foldernode[:depth] %>em;" data-object-uuid="<%= foldernode[:object].uuid %>">
+                  <i class="fa fa-fw fa-folder-o"></i>
+                  <% if foldernode[:object].uuid == current_user.uuid %>
+                    My Folders
+                  <% else %>
+                    <%= foldernode[:object].friendly_link_name || 'New folder' %>
+                  <% end %>
+                </div>
+              <% end %>
             <% end %>
           <% end %>
         </div>
diff --git a/apps/workbench/app/views/folders/_show_folders.html.erb b/apps/workbench/app/views/folders/_show_folders.html.erb
index e0c010d..806aa01 100644
--- a/apps/workbench/app/views/folders/_show_folders.html.erb
+++ b/apps/workbench/app/views/folders/_show_folders.html.erb
@@ -1,15 +1,21 @@
 <div class="container-fluid arv-folder-list">
-  <% [[@my_folder_tree, 'My folders'],
-     [@shared_folder_tree, 'Shared with me']].each do |tree, label| %>
-    <div class="row">
-      <i class="fa fa-fw fa-folder-open-o"></i> <%= label %>
-    </div>
+  <% [@my_folder_tree, @shared_folder_tree].each do |tree| %>
     <% tree.each do |foldernode| %>
-      <div class="folder row" style="padding-left: <%= 1 + foldernode[:depth] %>em;">
-        <i class="fa fa-fw fa-folder-o"></i>
-        <% if foldernode[:object].class == User %>
-          <%= foldernode[:object].friendly_link_name %>
+      <% rowtype = foldernode[:object].class %>
+      <div class="<%= 'folder' if rowtype != String %> row" style="padding-left: <%= 1 + foldernode[:depth] %>em;">
+        <% if rowtype == String %>
+          <i class="fa fa-fw fa-folder-open-o"></i>
+          <%= foldernode[:object] %>
+        <% elsif rowtype == User %>
+          <% if foldernode[:object].uuid == current_user.andand.uuid %>
+            <i class="fa fa-fw fa-folder-open-o"></i>
+            My Folders
+          <% else %>
+            <i class="fa fa-fw fa-folder-o"></i>
+            <%= foldernode[:object].friendly_link_name %>
+          <% end %>
         <% else %>
+          <i class="fa fa-fw fa-folder-o"></i>
           <%= link_to foldernode[:object] do %>
             <%= foldernode[:object].friendly_link_name %>
           <% end %>

-----------------------------------------------------------------------


hooks/post-receive
--