3170: Fix stale use of tab_pane_valid_state. refs #3170

[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 5cfa48710f88508a5feec99939d17591704e955a..0313de5aa2e7b9559146b9cfca7a6f31b166862d 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -1,6 +1,5 @@
 class UsersController < ApplicationController
   skip_before_filter :find_object_by_uuid, :only => [:welcome, :activity, :storage]
-  skip_around_filter :thread_with_mandatory_api_token, :only => :welcome
   before_filter :ensure_current_user_is_admin, only: [:sudo, :unsetup, :setup]
 
   def welcome
@@ -74,7 +73,7 @@ class UsersController < ApplicationController
       storage_log = Log.
         filter([[:object_uuid, '=', u.uuid],
                 [:event_type, '=', 'user-storage-report']]).
-        order(['created_at desc']).
+        order(:created_at => :desc).
         limit(1)
       storage_log.each do |log_entry|
         # We expect this block to only execute once since we specified limit(1)
@@ -107,11 +106,11 @@ class UsersController < ApplicationController
   end
 
   def sudo
-    resp = $arvados_api_client.api(ApiClientAuthorization, '', {
-                                     api_client_authorization: {
-                                       owner_uuid: @object.uuid
-                                     }
-                                   })
+    resp = arvados_api_client.api(ApiClientAuthorization, '', {
+                                    api_client_authorization: {
+                                      owner_uuid: @object.uuid
+                                    }
+                                  })
     redirect_to root_url(api_token: resp[:api_token])
   end
 
@@ -122,12 +121,12 @@ class UsersController < ApplicationController
 
     @my_jobs = Job.
       limit(10).
-      order(['created_at desc']).
+      order('created_at desc').
       where(created_by: current_user.uuid)
 
     @my_collections = Collection.
       limit(10).
-      order(['created_at desc']).
+      order('created_at desc').
       where(created_by: current_user.uuid)
     collection_uuids = @my_collections.collect &:uuid
 
@@ -151,7 +150,7 @@ class UsersController < ApplicationController
 
     @my_pipelines = PipelineInstance.
       limit(10).
-      order(['created_at desc']).
+      order('created_at desc').
       where(created_by: current_user.uuid)
 
     respond_to do |f|