Name new folders "New folder", fix crash if folder name is nil

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 46b20851ca264583688697a396975c238e4e4263..8c540fc227b6660b836253af11ff3c3e68932180 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -394,7 +394,7 @@ class ApplicationController < ActionController::Base
       @top_level_folders ||= Group.
         filter([['group_class','=','folder'],
                 ['owner_uuid','=',current_user.uuid]]).
-        sort_by(&:name)
+        sort_by { |x| x.name || '' }
     end
   end
 

diff --git a/apps/workbench/app/controllers/folders_controller.rb b/apps/workbench/app/controllers/folders_controller.rb
index 0a7f0f9e1e7cf063c4ee46a4f673ee9d8eb3db44..087d2a4ef8c09a940c058ae2573e85ae440c3fe7 100644 (file)
--- a/apps/workbench/app/controllers/folders_controller.rb
+++ b/apps/workbench/app/controllers/folders_controller.rb
@@ -68,6 +68,7 @@ class FoldersController < ApplicationController
 
   def create
     @new_resource_attrs = (params['folder'] || {}).merge(group_class: 'folder')
+    @new_resource_attrs[:name] ||= 'New folder'
     super
   end
 end