[ARVADOS] updated: 5674ba0e4490b53a0088cfd1181c6e1783124217

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |  2 +-
 .../api/app/controllers/application_controller.rb  |  2 +-
 services/api/test/fixtures/groups.yml              | 12 +++++
 services/api/test/fixtures/links.yml               | 56 ++++++++++++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)

       via  5674ba0e4490b53a0088cfd1181c6e1783124217 (commit)
       via  a3b9c1877a13f4c665020336584acafe43478650 (commit)
       via  62d9e76aab5c3e6c8863b1e1f42cf6d2153cdb93 (commit)
      from  3ef0016f85290758f286b6026fbd1a2d0c11ad4e (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 5674ba0e4490b53a0088cfd1181c6e1783124217
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Aug 22 11:58:41 2014 -0400

    3171: Do not use select param for database lookup during create/destroy actions.

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index ecf2514..8712936 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -204,7 +204,7 @@ class ApplicationController < ActionController::Base
     end
 
     if @select
-      if action_name != 'update'
+      unless action_name.in? %w(create update destroy)
         # Map attribute names in @select to real column names, resolve
         # those to fully-qualified SQL column names, and pass the
         # resulting string to the select method.

commit a3b9c1877a13f4c665020336584acafe43478650
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Aug 22 11:58:27 2014 -0400

    3171: Skip find_object_by_uuid during :create action.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 5c99c15..9e551bc 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -17,7 +17,7 @@ class ApplicationController < ActionController::Base
   before_filter :check_user_profile, except: ERROR_ACTIONS
   before_filter :check_user_notifications, except: ERROR_ACTIONS
   before_filter :load_filters_and_paging_params, except: ERROR_ACTIONS
-  before_filter :find_object_by_uuid, except: [:index, :choose] + ERROR_ACTIONS
+  before_filter :find_object_by_uuid, except: [:create, :index, :choose] + ERROR_ACTIONS
   theme :select_theme
 
   begin

commit 62d9e76aab5c3e6c8863b1e1f42cf6d2153cdb93
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Aug 22 11:56:20 2014 -0400

    3171: Add fixtures to make Workbench tests pass under new permission rules.

diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index c4ed133..a3a6fdc 100644
--- a/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@ -16,6 +16,18 @@ private_and_can_read_foofile:
   name: Private and Can Read Foofile
   description: Another Private Group
 
+activeandfriends:
+  uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
+  owner_uuid: zzzzz-tpzed-000000000000000
+  created_at: 2014-08-22 14:02:18.481582707 Z
+  modified_by_client_uuid:
+  modified_by_user_uuid: zzzzz-tpzed-000000000000000
+  modified_at: 2014-08-22 14:02:18.481319501 Z
+  name: Active User and friends
+  description:
+  updated_at: 2014-08-22 14:02:18.481166435 Z
+  group_class:
+
 system_owned_group:
   uuid: zzzzz-j7d0g-8ulrifv67tve5sx
   owner_uuid: zzzzz-tpzed-000000000000000
diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index 4125757..676e9d9 100644
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -707,3 +707,59 @@ empty_collection_name_in_active_user_home_project:
   head_uuid: d41d8cd98f00b204e9800998ecf8427e+0
   properties: {}
   updated_at: 2014-08-06 22:11:51.242010312 Z
+
+active_user_can_read_activeandfriends:
+  uuid: zzzzz-o0j2j-8184f5vk8c851ts
+  owner_uuid: zzzzz-tpzed-000000000000000
+  created_at: 2014-08-22 14:03:46.321059945 Z
+  modified_by_client_uuid:
+  modified_by_user_uuid: zzzzz-tpzed-000000000000000
+  modified_at: 2014-08-22 14:03:46.320865926 Z
+  tail_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  link_class: permission
+  name: can_read
+  head_uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
+  properties: {}
+  updated_at: 2014-08-22 14:03:46.320743213 Z
+
+active_user_joined_activeandfriends:
+  uuid: zzzzz-o0j2j-t63rdd7vupqvnco
+  owner_uuid: zzzzz-tpzed-000000000000000
+  created_at: 2014-08-22 14:03:28.835064240 Z
+  modified_by_client_uuid:
+  modified_by_user_uuid: zzzzz-tpzed-000000000000000
+  modified_at: 2014-08-22 14:03:28.834849409 Z
+  tail_uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
+  link_class: permission
+  name: can_read
+  head_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  properties: {}
+  updated_at: 2014-08-22 14:03:28.834720558 Z
+
+future_project_can_read_activeandfriends:
+  uuid: zzzzz-o0j2j-bkdtnddpmwxqiza
+  owner_uuid: zzzzz-tpzed-000000000000000
+  created_at: 2014-08-22 14:04:18.811622057 Z
+  modified_by_client_uuid:
+  modified_by_user_uuid: zzzzz-tpzed-000000000000000
+  modified_at: 2014-08-22 14:04:18.811463859 Z
+  tail_uuid: zzzzz-tpzed-futureprojview2
+  link_class: permission
+  name: can_read
+  head_uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
+  properties: {}
+  updated_at: 2014-08-22 14:04:18.811387314 Z
+
+future_project_user_joined_activeandfriends:
+  uuid: zzzzz-o0j2j-ksl8bo92eokv332
+  owner_uuid: zzzzz-tpzed-000000000000000
+  created_at: 2014-08-22 14:04:24.182103355 Z
+  modified_by_client_uuid:
+  modified_by_user_uuid: zzzzz-tpzed-000000000000000
+  modified_at: 2014-08-22 14:04:24.181939129 Z
+  tail_uuid: zzzzz-j7d0g-swqu6hmi4pa7bk7
+  link_class: permission
+  name: can_read
+  head_uuid: zzzzz-tpzed-futureprojview2
+  properties: {}
+  updated_at: 2014-08-22 14:04:24.181799856 Z

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


hooks/post-receive
--