[ARVADOS] updated: edebf116a9f743a7a276d514c4cbad72c3406922

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/users_controller.rb | 8 ++++++++
 apps/workbench/app/views/projects/_choose.html.erb | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

       via  edebf116a9f743a7a276d514c4cbad72c3406922 (commit)
       via  ea2fecde7e80f9d6c493bcb1bf2b7ee25fd96b12 (commit)
      from  4eae62369588616d8833010c5febc939a4820cf0 (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 edebf116a9f743a7a276d514c4cbad72c3406922
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Wed Aug 13 11:12:36 2014 -0400

    3114: When current user, show root/home project rather than user attributes when landing on show user page.
    (This is meant to be a compromise due to the fact that a home project's uuid has "user" as its arvados type, rather than "group".)

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 67b51a9..d817b32 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -2,6 +2,14 @@ class UsersController < ApplicationController
   skip_before_filter :find_object_by_uuid, :only => [:welcome, :activity, :storage]
   before_filter :ensure_current_user_is_admin, only: [:sudo, :unsetup, :setup]
 
+  def show
+    if params[:uuid] == current_user.uuid
+      redirect_to project_path(params[:uuid])
+    else
+      super
+    end
+  end
+
   def welcome
     if current_user
       params[:action] = 'home'

commit ea2fecde7e80f9d6c493bcb1bf2b7ee25fd96b12
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Wed Aug 13 11:09:55 2014 -0400

    3114: bug fix: 'Copy' button is now disabled until a project has been selected for copying to

diff --git a/apps/workbench/app/views/projects/_choose.html.erb b/apps/workbench/app/views/projects/_choose.html.erb
index 3d55041..82b9485 100644
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -42,7 +42,7 @@
 
       <div class="modal-footer">
         <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
-        <button class="btn btn-primary" aria-hidden="true"><%= params[:action_name] || 'Select' %></button>
+        <button class="btn btn-primary" aria-hidden="true" data-enable-if-selection disabled><%= params[:action_name] || 'Select' %></button>
         <div class="modal-error hide" style="text-align: left; margin-top: 1em;">
         </div>
       </div>

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


hooks/post-receive
--