3988: Update crunch-job, arv-run-pipeline-instance and workbench to read/write

[arvados.git] / apps / workbench / app / views / application / 404.html.erb

diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index 86e04ce7b8f504969f80732b14189ec85beaa266..8a0482274ad0cd18fcbde0d1cb770991ac4f995f 100644 (file)
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -1,10 +1,13 @@
 <%
    if (controller.andand.action_name == 'show') and params[:uuid]
-     class_name = controller.model_class.to_s.underscore.humanize(capitalize: false)
-     req_item = safe_join([class_name, " with UUID ",
+     class_name = controller.model_class.to_s.underscore
+     class_name_h = class_name.humanize(capitalize: false)
+     req_item = safe_join([class_name_h, " with UUID ",
                            raw("<code>"), params[:uuid], raw("</code>")], "")
+     req_item_plain_text = safe_join([class_name_h, " with UUID ", params[:uuid]])
    else
      req_item = "page you requested"
+     req_item_plain_text = "page you requested"
    end
 %>
 
@@ -14,8 +17,10 @@
 
 <% if class_name %>
 Perhaps you'd like to
-<%= link_to("browse all #{class_name.pluralize}", action: :index, controller: class_name.tableize) %>?
+<%= link_to("browse all #{class_name_h.pluralize}", action: :index, controller: class_name.tableize) %>?
 <% end %>
 
 </p>
 
+<% error_message = "The #{req_item_plain_text} was not found." %>
+<%= render :partial => "report_error", :locals => {error_message: error_message, error_type: '404'} %>