Merge remote-tracking branch 'remotes/origin/1636-inactive-user' into 1678-new-user...

[arvados.git] / apps / workbench / app / controllers / users_controller.rb

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 62007ff1c709cf697b40c5b630cc011e7f96697f..f48d3b2b92b923ad7b52316fcdb587a6dc927b18 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -1,11 +1,11 @@
 class UsersController < ApplicationController
   skip_before_filter :find_object_by_uuid, :only => :welcome
+  skip_around_filter :thread_with_api_token, :only => :welcome
+  around_filter :thread_with_optional_api_token, :only => :welcome
 
   def welcome
     if current_user
       redirect_to home_user_path(current_user.uuid)
-    else
-      redirect_to $arvados_api_client.arvados_login_url(return_to: request.url)
     end
   end
 
@@ -13,16 +13,15 @@ class UsersController < ApplicationController
     @my_ssh_keys = AuthorizedKey.where(authorized_user_uuid: current_user.uuid)
     @my_vm_perms = Link.where(tail_uuid: current_user.uuid, head_kind: 'arvados#virtual_machine', link_class: 'permission', name: 'can_login')
     @my_repo_perms = Link.where(tail_uuid: current_user.uuid, head_kind: 'arvados#repository', link_class: 'permission', name: 'can_write')
-    @my_last_job = Job.
-      limit(1).
-      order(:created_at).
-      where(created_by: current_user.uuid).
-      last
+    @my_jobs = Job.
+      limit(10).
+      order('created_at desc').
+      where(created_by: current_user.uuid)
 
     # A Tutorial is a Link which has link_class "resources" and name
     # "wants", and is owned by the Tutorials Group (i.e., named
     # "Arvados Tutorials" and owned by the system user).
-    @tutorial_group = Group.where(owner: User.system.uuid,
+    @tutorial_group = Group.where(owner_uuid: User.system.uuid,
                                   name: 'Arvados Tutorials').first
     if @tutorial_group
       @tutorial_links = Link.where(tail_uuid: @tutorial_group.uuid,