[ARVADOS] updated: af19eb3a35900457a1dcfadee789a9052fb50335

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/users_controller.rb |    8 ++++++++
 .../app/views/users/_show_activity.html.erb        |    4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 apps/workbench/app/views/users/_show_activity.html.erb

       via  af19eb3a35900457a1dcfadee789a9052fb50335 (commit)
      from  7db862a48062c6086ea8a6787149afa7d66b1919 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit af19eb3a35900457a1dcfadee789a9052fb50335
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Mar 16 17:09:35 2014 -0400

    Add link from users#index to users#activity. Not as good as showing it
    in the tab itself, but better than no link at all.

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index c87bd25..35c9660 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -71,6 +71,14 @@ class UsersController < ApplicationController
     end
   end
 
+  def index_pane_list
+    if current_user.andand.is_admin
+      super | %w(Activity)
+    else
+      super
+    end
+  end
+
   def sudo
     resp = $arvados_api_client.api(ApiClientAuthorization, '', {
                                      api_client_authorization: {
diff --git a/apps/workbench/app/views/users/_show_activity.html.erb b/apps/workbench/app/views/users/_show_activity.html.erb
new file mode 100644
index 0000000..ea53307
--- /dev/null
+++ b/apps/workbench/app/views/users/_show_activity.html.erb
@@ -0,0 +1,4 @@
+<p>
+  As an admin user, you can <%= link_to "view recent user activity", activity_users_url %>.
+</p>
+

-----------------------------------------------------------------------


hooks/post-receive
--