[ARVADOS] updated: 9389aa1647945c32bb45e20726b47ff66c298826

git at public.curoverse.com git at public.curoverse.com
Mon Aug 11 15:07:30 EDT 2014


Summary of changes:
 apps/workbench/app/views/application/_choose.html.erb      | 3 +--
 apps/workbench/test/integration/pipeline_instances_test.rb | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

       via  9389aa1647945c32bb45e20726b47ff66c298826 (commit)
       via  965bf2a51134ed26fb23d2209d9a0d319fe05744 (commit)
       via  cd3a0b27c6985f72d58581d43c7cd6686a977f56 (commit)
      from  b79c440b6af5cf4855e3fb3fb510b3eb8de1da9c (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 9389aa1647945c32bb45e20726b47ff66c298826
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 11 15:07:22 2014 -0400

    3489: Add test for correct dropdown text.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 0a6c340..3c00bb7 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -117,6 +117,8 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       click
 
     within('.modal-dialog') do
+      assert_selector('button.dropdown-toggle', text: 'A Project',
+                      failure_message: 'Projects dropdown button has wrong title')
       first('span', text: 'foo_tag').click
       find('button', text: 'OK').click
     end

commit 965bf2a51134ed26fb23d2209d9a0d319fe05744
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 11 14:56:15 2014 -0400

    3489: Degrade nicely if initial filter refers to an unreadable project.

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 0f3f0ee..68351a9 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -15,7 +15,7 @@
                    if val == current_user.uuid
                      selected_project_name = "Home"
                    else
-                     selected_project_name = Group.find?(val).name
+                     selected_project_name = Group.find(val).name rescue val
                    end
                  end
                end

commit cd3a0b27c6985f72d58581d43c7cd6686a977f56
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 11 14:54:35 2014 -0400

    3489: Remove debug comment.

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 1883658..0f3f0ee 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -23,7 +23,6 @@
             <div class="input-group-btn" data-filterable-target=".modal.arv-choose .selectable-container">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                 <%= selected_project_name %> <span class="caret"></span>
-                <!-- <%= @filters.inspect %> -->
               </button>
               <ul class="dropdown-menu" role="menu">
                 <li>

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list