X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b9b45283eb987cb59419b8714f8a06d7f7b6b8c3..656176226eeb75d24c17de792cc090e4862c46f5:/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 7d15d95557..2d9b5cf2c6 100644
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -1,32 +1,76 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
<%
if (controller.andand.action_name == 'show') and params[:uuid]
+ check_trash = controller.model_class.include_trash(true).where(uuid: params[: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(""), params[:uuid], raw("
")], "")
+ raw(""), params[:uuid], raw("
")], "")
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
%>
+ <% if check_trash.andand.any? %>
+
The <%= req_item %> is in the trash. + + <% object = check_trash.first %> + + <% if object.is_trashed + untrash_object = object + else + end %> + + <% if untrash_object.editable? %> + <% msg = "Untrash '" + if !untrash_object.name.blank? then untrash_object.name else untrash_object.uuid end + "'?" %> + <%= link_to({action: 'untrash_items', selection: [untrash_object.uuid], controller: :trash_items}, remote: true, method: :post, + title: "Untrash", style: 'cursor: pointer;') do %> + + <% end %> + + <%= form_tag url_for({action: 'untrash_items', controller: :trash_items}), {method: :post} %> + <%= hidden_field_tag :selection, [untrash_object.uuid] %> + + <% end %> + <% else %> + <% %> + <% end %> +
+ + <% else %> +The <%= req_item %> was not found. +
The <%= req_item %> was not found.
+ +<% if !current_user %> + ++ <%= link_to(arvados_api_client.arvados_login_url(return_to: strip_token_from_path(request.url)), + {class: "btn btn-primary report-issue-modal-window"}) do %> + Log in + <% end %> + to view private data. +
+ +<% elsif class_name %> + ++ Perhaps you'd like to <%= link_to("browse all + #{class_name_h.pluralize}", action: :index, controller: + class_name.tableize) %>? +
-<% if class_name %> -Perhaps you'd like to -<%= link_to("browse all #{class_name_h.pluralize}", action: :index, controller: class_name.tableize) %>? <% end %> - +<% end %> -
-
<% error_message = "The #{req_item_plain_text} was not found." %>
-Would you like to report this problem?
-<%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.fullpath, action_method: 'post', error_message: error_message),
- {class: 'btn btn-primary report-issue-modal-window', 'data-toggle' => "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
- Report problem
-<% end %>
-