Fix "create folder"

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 6a761f6cb07c29a9b1360f8a2e57c43d761be46a..31f3464b0ce817373808bd1a3062c5ca647d6961 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -129,10 +129,10 @@ class ApplicationController < ActionController::Base
   end
 
   def create
-    new_resource_attrs = params[model_class.to_s.underscore.singularize]
-    new_resource_attrs ||= {}
-    new_resource_attrs.reject! { |k,v| k.to_s == 'uuid' }
-    @object ||= model_class.new new_resource_attrs
+    @new_resource_attrs ||= params[model_class.to_s.underscore.singularize]
+    @new_resource_attrs ||= {}
+    @new_resource_attrs.reject! { |k,v| k.to_s == 'uuid' }
+    @object ||= model_class.new @new_resource_attrs
     @object.save!
 
     respond_to do |f|

diff --git a/apps/workbench/app/controllers/folders_controller.rb b/apps/workbench/app/controllers/folders_controller.rb
index 12ffc205e7bf3f698fea01dd10eb45891d809fa2..3f536fbea4eeec21c1e30322daf123b613dcb16a 100644 (file)
--- a/apps/workbench/app/controllers/folders_controller.rb
+++ b/apps/workbench/app/controllers/folders_controller.rb
@@ -14,8 +14,7 @@ class FoldersController < ApplicationController
   end
 
   def create
-    params['folder'] ||= {}.with_indifferent_access
-    params['folder']['group_class'] = 'folder'
+    @new_resource_attrs = (params['folder'] || {}).merge(group_class: 'folder')
     super
   end
 end

diff --git a/apps/workbench/app/models/group.rb b/apps/workbench/app/models/group.rb
index c628b5699c58adadfc70871a43d5e043dfd6ae41..53a9496c69d0eba2f457b8107cb67831edca55e4 100644 (file)
--- a/apps/workbench/app/models/group.rb
+++ b/apps/workbench/app/models/group.rb
@@ -7,4 +7,8 @@ class Group < ArvadosBase
     ret.results = $arvados_api_client.unpack_api_response(res)
     ret
   end
+
+  def class_for_display
+    group_class == 'folder' ? 'Folder' : super
+  end
 end

diff --git a/apps/workbench/app/views/application/index.html.erb b/apps/workbench/app/views/application/index.html.erb
index 06735c1fb7c7d8bf5bcb237b2145327c6ec819ea..a32e7bfdb9ff897d6ca6fc18735d9b774049cc61 100644 (file)
--- a/apps/workbench/app/views/application/index.html.erb
+++ b/apps/workbench/app/views/application/index.html.erb
@@ -12,7 +12,7 @@
           'data-target' => '#user-setup-modal-window', return_to: request.url}  %>
       <div id="user-setup-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
     <% else %>
-      <%= button_to "Add a new #{controller.controller_name.humanize.downcase}",
+      <%= button_to "Add a new #{controller.controller_name.singularize.humanize.downcase}",
         { action: 'create' },
         { class: 'btn btn-primary pull-right' } %>
     <% end %>

diff --git a/apps/workbench/app/views/folders/show.html.erb b/apps/workbench/app/views/folders/show.html.erb
index a89afbca5e4c777d1970e12eb630b03481a83315..c02c48b9216f19a2725a4c0cb91e5af2aeea1767 100644 (file)
--- a/apps/workbench/app/views/folders/show.html.erb
+++ b/apps/workbench/app/views/folders/show.html.erb
@@ -46,7 +46,7 @@
           Created: <%= @object.created_at.to_s(:long) %>
         </p>
         <p>
-          Last modified: <%= @object.modified_at.to_s(:long) %> by <%= link_to_if_arvados_object @object.modified_by_user_uuid %>
+          Last modified: <%= @object.modified_at.to_s(:long) %> by <%= link_to_if_arvados_object @object.modified_by_user_uuid, friendly_name: true %>
         </p>
         <% end %>
       </div>