[ARVADOS] updated: 6791c56b529545a191a3e9f714c5493744948ba4

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/layouts/body.html.erb     |  4 ++--
 .../app/views/projects/_show_dashboard.html.erb    | 17 +++++++--------
 .../test/controllers/projects_controller_test.rb   | 24 ++++++++--------------
 3 files changed, 18 insertions(+), 27 deletions(-)

       via  6791c56b529545a191a3e9f714c5493744948ba4 (commit)
       via  9a4c7cb68d761329152bf49637c6fd0f8322bbd5 (commit)
      from  15696397596dfebd42ebb415772237394ceca978 (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 6791c56b529545a191a3e9f714c5493744948ba4
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 19 23:59:07 2015 -0400

    6640: Fix whitespace, remove excess end tag.

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index d14bf99..22ccc2f 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -212,7 +212,7 @@
                           action_href: url_for(controller: :actions, action: :show),
                           action_method: 'get',
                           action_data: {selection_param: 'uuid', success: 'redirect-to-created-object'}.to_json),
-                { remote: true, method: 'get', title: "Search" }) do %>
+                        { remote: true, method: 'get', title: "Search" }) do %>
                     <i class="glyphicon fa-fw glyphicon-search"></i> Search all projects ...
                   <% end %>
                </li>
@@ -225,7 +225,7 @@
                   <i class="fa fa-fw fa-plus"></i> Add a new project
                 <% end %>
               </li>
-               <li role="presentation" class="divider"></li>
+              <li role="presentation" class="divider"></li>
               <%= render partial: "projects_tree_menu", locals: {
                   :project_link_to => Proc.new do |pnode, &block|
                     link_to(project_path(pnode[:object].uuid),
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 437f05a..47a2723 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -1,4 +1,3 @@
-
   <div class="row">
     <div class="col-md-6">
       <div class="panel panel-default" style="min-height: 10.5em">
@@ -65,7 +64,7 @@
             </div>
           <% end %>
           <% end %>
-          </div>
+        </div>
       </div>
 
       <div class="panel panel-default">
@@ -164,17 +163,15 @@
           <% r = recent_collections(8) %>
           <% r[:collections].each do |p| %>
             <div class="dashboard-panel-info-row">
-            <div>
-              <i class="fa fa-fw fa-folder-o"></i><%= link_to_if_arvados_object r[:owners][p[:owner_uuid]], friendly_name: true %>/
-              <span class="pull-right"><%= render_localized_date(p[:modified_at], "noseconds") %></span>
-            </div>
-            <div class="text-overflow-ellipsis" style="margin-left: 1em; width: 100%"><%= link_to_if_arvados_object p, {friendly_name: true, no_tags: true} %>
-            </div>
+              <div>
+                <i class="fa fa-fw fa-folder-o"></i><%= link_to_if_arvados_object r[:owners][p[:owner_uuid]], friendly_name: true %>/
+                <span class="pull-right"><%= render_localized_date(p[:modified_at], "noseconds") %></span>
+              </div>
+              <div class="text-overflow-ellipsis" style="margin-left: 1em; width: 100%"><%= link_to_if_arvados_object p, {friendly_name: true, no_tags: true} %>
+              </div>
             </div>
           <% end %>
         </div>
       </div>
     </div>
   </div>
-
-</div>

commit 9a4c7cb68d761329152bf49637c6fd0f8322bbd5
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 19 23:32:28 2015 -0400

    6640: Replace paging test with all_projects bugfix test.

diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index e497069..3416cc0 100644
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -408,20 +408,14 @@ class ProjectsControllerTest < ActionController::TestCase
     assert_includes @response.body, "<a href=\"/projects/public\">Public Projects</a>"
   end
 
-  test "project menu shows all projects owned" do
-    use_token :user1_with_load
-
-    # API server returns 100 objects per request even if more exist.
-    # So create 101 objects to verify that multiple pages are fetched as needed
-    (1..101).each do |i|
-      Group.create(name: "My new project #{i}", group_class: 'project')
-    end
-
-    # Get all_projects readable by this user
-    all_projects = @controller.send :all_projects
-    refute_nil all_projects
-
-    assert_equal true, all_projects.items_available>101
-    assert_equal all_projects.items_available, all_projects.results.length
+  test 'all_projects unaffected by params after use by ProjectsController (#6640)' do
+    @controller = ProjectsController.new
+    project_uuid = api_fixture('groups')['aproject']['uuid']
+    get :index, {
+      filters: [['uuid', '<', project_uuid]].to_json,
+      limit: 0,
+      offset: 1000,
+    }, session_for(:active)
+    assert_select "#projects-menu + ul li.divider ~ li a[href=/projects/#{project_uuid}]"
   end
 end

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


hooks/post-receive
--