[ARVADOS] updated: b23240bded4d76bf953a4f8c499f58d9066c34dc

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/application/404.html.erb | 4 ++++
 apps/workbench/test/integration/errors_test.rb    | 6 ++++++
 2 files changed, 10 insertions(+)

       via  b23240bded4d76bf953a4f8c499f58d9066c34dc (commit)
      from  33e6d3356af3f7eaa484dbaa7a671aa25f5042e4 (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 b23240bded4d76bf953a4f8c499f58d9066c34dc
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Feb 3 00:14:17 2015 -0500

    2659: add a "you are not logged in" warning in 404 page.

diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index 8a04822..4c8fa76 100644
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -13,6 +13,10 @@
 
 <h2>Not Found</h2>
 
+<% if !current_user %>
+<p>You are not logged into Arvados. Please retry after log in.</p><br/>
+<% end %>
+
 <p>The <%= req_item %> was not found.
 
 <% if class_name %>
diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index 03c359e..23e8c01 100644
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -126,4 +126,10 @@ class ErrorsTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "404 page checks if user not logged in and makes suggestion" do
+    visit "/collections/#{BAD_UUID}"
+    assert_text 'You are not logged into Arvados',
+                'Not found: You are not logged into Arvados'
+  end
+
 end

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


hooks/post-receive
--