[ARVADOS] updated: db9ccbd2fab6edf279408a6869a2cf2409d5f335

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/projects_controller.rb         | 39 ++++++++++++++--------
 apps/workbench/test/integration/projects_test.rb   |  4 +--
 2 files changed, 28 insertions(+), 15 deletions(-)

       via  db9ccbd2fab6edf279408a6869a2cf2409d5f335 (commit)
       via  b941bb69fdf0bfd2cc2ce0de82f570e70f7af86c (commit)
      from  893f659712cd9b742829b17e2cedc822901608ec (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 db9ccbd2fab6edf279408a6869a2cf2409d5f335
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Tue Sep 16 19:09:32 2014 -0400

    3338: move the user_is_manager and shared items to the already-overridden #find_object_by_uuid method so that these are available to all the same actions

diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index 748072e..46b8d15 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -26,6 +26,17 @@ class ProjectsController < ApplicationController
     else
       super
     end
+
+    @user_is_manager = false
+    @share_links = []
+    if @object.uuid != current_user.uuid
+      begin
+        @share_links = Link.permissions_for(@object)
+        @user_is_manager = true
+      rescue ArvadosApiClient::AccessForbiddenException,
+        ArvadosApiClient::NotFoundException
+      end
+    end
   end
 
   def index_pane_list
@@ -59,14 +70,27 @@ class ProjectsController < ApplicationController
     ]
     # Note that adding :filters to 'Sharing' won't help show the count for it because @user_is_manager is only set in #show
     # Therefore if a count were desired there we'd want to set @user_is_manager in a before_filter or somesuch.
-    pane_list << { :name => 'Sharing' } if @user_is_manager
+    pane_list << { :name => 'Sharing',
+                   :count => @share_links.count } if @user_is_manager
     pane_list << { :name => 'Advanced' }
   end
 
+  # Called via AJAX and returns Javascript that populates tab counts into tab titles.
+  # References #show_pane_list action which should return an array of hashes each with :name 
+  # and then optionally a :filters to run or a straight up :count
+  #
+  # This action could easily be moved to the ApplicationController to genericize the tab_counts behaviour,
+  # but one or more new routes would have to be created, the js.erb would also have to be moved
   def tab_counts
     @tab_counts = {}
     show_pane_list.each do |pane|
-      @tab_counts[pane[:name]] = @object.contents(filters: pane[:filters]).count if pane[:filters]
+      if pane.is_a?(Hash)
+        if pane[:count]
+          @tab_counts[pane[:name]] = pane[:count]
+        elsif pane[:filters]
+          @tab_counts[pane[:name]] = @object.contents(filters: pane[:filters]).items_available
+        end
+      end
     end
   end
 
@@ -190,17 +214,6 @@ class ProjectsController < ApplicationController
       return render_not_found("object not found")
     end
 
-    @user_is_manager = false
-    @share_links = []
-    if @object.uuid != current_user.uuid
-      begin
-        @share_links = Link.permissions_for(@object)
-        @user_is_manager = true
-      rescue ArvadosApiClient::AccessForbiddenException,
-        ArvadosApiClient::NotFoundException
-      end
-    end
-
     if params[:partial]
       load_contents_objects
       respond_to do |f|

commit b941bb69fdf0bfd2cc2ce0de82f570e70f7af86c
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Tue Sep 16 19:05:45 2014 -0400

    3338: fix the integration test so that it checks the on-screen collection count
    rather than trying to use the fixtures which doesn't work anyway

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index d36e75b..e061b5f 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -9,9 +9,9 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
   test 'Check collection count for A Project in the tab pane titles' do
     project_uuid = api_fixture('groups')['aproject']['uuid']
-    collection_fixture_count = api_fixture('collections').select{|k,v| v['owner_uuid'] == project_uuid}.count
     visit page_with_token 'active', '/projects/' + project_uuid
-    assert_selector '#Data_collections-tab span', text: "(#{collection_fixture_count})"
+    collection_count = page.all("[data-pk*='collection']").count
+    assert_selector '#Data_collections-tab span', text: "(#{collection_count})"
   end
 
   test 'Find a project and edit its description' do

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


hooks/post-receive
--