11060: sort order and delete prompt updated

Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika@curoverse.com>

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 6f527cd1aca3bf824fc25ece100a5117cc4e53d8..350f297af3bbcea1b3f9797b273ab15c7cf072c0 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -258,7 +258,7 @@ class UsersController < ApplicationController
 
   def repositories
     # all repositories accessible by current user
-    all_repositories = Hash[Repository.all.order(:name).collect {|repo| [repo.uuid, repo]}]
+    all_repositories = Hash[Repository.all.order('name asc').collect {|repo| [repo.uuid, repo]}]
 
     @my_repositories = [] # we want them ordered as owned and the rest
     @repo_writable = {}

diff --git a/apps/workbench/app/views/users/_repositories.html.erb b/apps/workbench/app/views/users/_repositories.html.erb
index 0ac84056f0dcebdffe3f7aa08190e5b60a85d14b..ba91b9c3f14ee1e7ff4cdd54699998cf41ae1a0c 100644 (file)
--- a/apps/workbench/app/views/users/_repositories.html.erb
+++ b/apps/workbench/app/views/users/_repositories.html.erb
@@ -19,10 +19,6 @@
     <p>
       In order to clone git repositories using SSH, <%= link_to ssh_keys_user_path(current_user) do%> add an SSH key to your account<%end%> and clone the git@ URLs.
     </p>
-    <p>
-      For more information see <%= link_to raw('Writing a pipeline'),
-      "#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-firstscript.html", target: "_blank"%>.
-    </p>
 
     <% if !@my_repositories.any? %>
       You do not seem to have access to any repositories. If you would like to request access, please contact your system admin.
@@ -57,7 +53,7 @@
               </td>
               <td>
                 <% if repo.editable? %>
-                    <%= link_to(repository_path(id: repo.uuid), method: :delete, class: 'btn btn-sm', data: {confirm: "Really delete repositories?"}) do %>
+                    <%= link_to(repository_path(id: repo.uuid), method: :delete, class: 'btn btn-sm', data: {confirm: "Really delete '#{repo.name || repo.uuid}'?"}) do %>
                         <i class="fa fa-fw fa-trash-o"></i>
                     <% end %>
                 <% end %>