[ARVADOS] updated: d7bc150a11260ba93d3403ef4c49b12baf2a93a0
Git user
git at public.curoverse.com
Wed Jun 7 17:17:38 EDT 2017
Summary of changes:
.../workbench/app/controllers/search_controller.rb | 2 +
apps/workbench/app/models/arvados_base.rb | 4 +
apps/workbench/app/models/arvados_resource_list.rb | 5 +
.../views/trash_items/_show_recent_trash.html.erb | 2 +-
.../views/trash_items/_show_trash_rows.html.erb | 4 +-
.../app/views/trash_items/_untrash_item.html.erb | 2 +-
.../test/controllers/search_controller_test.rb | 23 ++
apps/workbench/test/integration/trash_test.rb | 1 -
doc/api/methods/groups.html.textile.liquid | 1 +
.../controllers/arvados/v1/groups_controller.rb | 14 +-
services/api/app/models/user.rb | 37 +--
services/api/lib/can_be_an_owner.rb | 33 +++
services/api/lib/create_ancestor_view.sql | 14 ++
.../arvados/v1/groups_controller_test.rb | 47 ++++
services/keep-web/cache.go | 259 +++++++++++++++++++++
services/keep-web/cache_test.go | 104 +++++++++
services/keep-web/handler.go | 23 +-
services/keep-web/handler_test.go | 8 +-
services/keep-web/main.go | 10 +
services/keep-web/server_test.go | 14 +-
services/keep-web/status_test.go | 46 ++++
services/keep-web/usage.go | 20 ++
22 files changed, 627 insertions(+), 46 deletions(-)
create mode 100644 services/api/lib/create_ancestor_view.sql
create mode 100644 services/keep-web/cache.go
create mode 100644 services/keep-web/cache_test.go
create mode 100644 services/keep-web/status_test.go
via d7bc150a11260ba93d3403ef4c49b12baf2a93a0 (commit)
via 29cb16bdd726b09f8cded0d245ed6a72c62eaf8b (commit)
via 7e0409e3b5e2fd80f7a74feb719dbc41c2193ef6 (commit)
via 72e22b49ec2721d3a1369da768d3d74fa9c079c3 (commit)
via 9d894536b8a7044fdfa168f81a38c3408e6cd7b4 (commit)
via d22400822b3489c621e5dbd902749b1a547ca579 (commit)
via f7b0474852fa8f270605c4cb5eeaf85c910c421e (commit)
via 478d5dbf9a4ee280122db2a208b91d8ad97e3b99 (commit)
via 6246cacc17e8b90519143e717b7241e527678be9 (commit)
via eb21778470992713458dc42e4a115bd0a619c5de (commit)
via a15a137c593d24649e2960471d7273acad695186 (commit)
via f2fae587a47ae4e1344d6054960136f935b1449b (commit)
via b745c25cb15077f4f5cd658a6d59392c48bc8add (commit)
via 46580c9d21578ec9f0638c9cb464703c7ede00b3 (commit)
via 0940739d41d71154937354696634a2989a9db9fc (commit)
via 29665e2d9a543bffb237d148c3484c03b03e30aa (commit)
via 4daf12ad8cb2f74c3f3d72eafef7ed7a0621a4ac (commit)
via f1aed11fd3a5e204a2cf2e4fc5f099179e877eb6 (commit)
via 6fef82432952b78f61c7be80820e88804b3a47d7 (commit)
via aa552a3337c1a63d1638c39cb01ab03b0b9009cc (commit)
via 87ea4388edb977d246b09b78d9d4bfa5c2ba5170 (commit)
via fd4bdb760eb47013b8b60b40859ba7f004ee8383 (commit)
via efcfd2cdc9a9ed6ab3af54e9a4e149d4bdf1f8d3 (commit)
from b42d7d9ed4640296ae5d01d26268c4fdba1ca10c (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 d7bc150a11260ba93d3403ef4c49b12baf2a93a0
Author: radhika <radhika at curoverse.com>
Date: Wed Jun 7 17:16:34 2017 -0400
9587: Show "delete_at" timestamp instead of "created_at" timestamp in trash page
diff --git a/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb b/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
index 4d9be07..14c5409 100644
--- a/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_recent_trash.html.erb
@@ -39,7 +39,7 @@
<th></th>
<th>Name</th>
<th>Trashed at</th>
- <th>Created at</th>
+ <th title="After this time, no longer available to be recovered from Trash">Permanently<br/>Deleted At</th>
<th>Owner</th>
<th>Contents</th>
<th></th>
diff --git a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
index 4cc16f6..747f185 100644
--- a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
@@ -2,7 +2,7 @@
<tr data-object-uuid="<%= obj.uuid %>" data-kind="<%= obj.kind %>" >
<td>
<% if obj.editable? %>
- <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection' %>
+ <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection', style: 'cursor: pointer;' %>
<% end %>
</td>
<td>
@@ -10,7 +10,7 @@
<td>
<%= render_localized_date(obj.trash_at) if obj.trash_at %>
<td>
- <%= render_localized_date(obj.created_at) if obj.created_at %>
+ <%= render_localized_date(obj.delete_at) if obj.delete_at %>
</td>
<td>
<%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
diff --git a/apps/workbench/app/views/trash_items/_untrash_item.html.erb b/apps/workbench/app/views/trash_items/_untrash_item.html.erb
index 8732531..74255c3 100644
--- a/apps/workbench/app/views/trash_items/_untrash_item.html.erb
+++ b/apps/workbench/app/views/trash_items/_untrash_item.html.erb
@@ -1,7 +1,7 @@
<% if object.editable? %>
<% msg = "Untrash '" + if !object.name.blank? then object.name else object.uuid end + "'?" %>
<%= link_to({action: 'untrash_items', selection: [object.uuid]}, remote: true, method: :post,
- title: "Untrash", data: {confirm: msg}) do %>
+ title: "Untrash", style: 'cursor: pointer;') do %>
<i class="fa fa-fw fa-recycle"></i>
<% end %>
<% end %>
diff --git a/apps/workbench/test/integration/trash_test.rb b/apps/workbench/test/integration/trash_test.rb
index 6cac1be..cd2fa39 100644
--- a/apps/workbench/test/integration/trash_test.rb
+++ b/apps/workbench/test/integration/trash_test.rb
@@ -42,7 +42,6 @@ class TrashTest < ActionDispatch::IntegrationTest
# Un-trash another item using the recycle button
within('tr', text: expired1['name']) do
first('.fa-recycle').click
- accept_alert
end
wait_for_ajax
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list