[ARVADOS] updated: f9ff1c5444f7030fa0b372446bd40d4feed203c8
Git user
git at public.curoverse.com
Mon Jun 5 20:41:14 EDT 2017
Summary of changes:
.../workbench/app/assets/javascripts/filterable.js | 1 +
.../app/assets/javascripts/select_modal.js | 1 +
.../app/controllers/trash_items_controller.rb | 23 ++-
.../app/views/trash_items/_show_recent.html.erb | 2 +-
.../views/trash_items/_show_trash_rows.html.erb | 4 +-
build/run-tests.sh | 2 +-
sdk/cwl/setup.py | 2 +-
sdk/go/arvados/client.go | 19 +-
sdk/go/arvadosclient/arvadosclient.go | 98 +++++-----
sdk/go/arvadosclient/arvadosclient_test.go | 18 +-
sdk/go/keepclient/discover.go | 204 +++++++++++++--------
sdk/go/keepclient/discover_test.go | 17 +-
sdk/go/keepclient/keepclient.go | 167 ++++++++++++-----
sdk/go/keepclient/keepclient_test.go | 19 +-
sdk/go/keepclient/support.go | 57 +-----
.../arvados/v1/keep_services_controller.rb | 1 +
.../arvados/v1/keep_services_controller_test.rb | 6 +-
services/keep-balance/integration_test.go | 9 +-
services/keep-web/handler.go | 7 +-
services/keepproxy/keepproxy.go | 48 +++--
services/keepproxy/keepproxy_test.go | 2 +-
services/keepstore/keepstore.go | 1 -
services/keepstore/pull_worker_integration_test.go | 15 +-
tools/keep-block-check/keep-block-check.go | 14 +-
tools/keep-block-check/keep-block-check_test.go | 13 +-
tools/keep-exercise/keep-exercise.go | 8 +-
tools/keep-rsync/keep-rsync.go | 14 +-
tools/keep-rsync/keep-rsync_test.go | 149 +++++++--------
28 files changed, 522 insertions(+), 399 deletions(-)
via f9ff1c5444f7030fa0b372446bd40d4feed203c8 (commit)
via cc77c62e148a632c5b690c275fd9fbf659ad2715 (commit)
via 55315b668b8fa04572a44fd7db6598478f54130a (commit)
via 0a6adabd77bf483186a29a7cffef38866a5ee8e0 (commit)
via 0560a5812377315a92c8a4e9b41a68677832ea65 (commit)
via 695a100d4bd3bf4f5534c7e489c118c2917bf35a (commit)
via dcd20d41fde4216345a20ddfa950b40de74b85b5 (commit)
via cb230b07e0125d819991bc74a1f528740068157d (commit)
via a10eb3ebf97a29687c6f43d705e30fb0349364d2 (commit)
via 5d03f6499055ef109ca2c8d5d59941b25de1fa47 (commit)
via f834a9841fe27c18bc31e58636ec1bcdb833b54b (commit)
via 0f5295ae31362eefe182f3a2329b3903d6f82a3b (commit)
via c5e4c7027338235435e9698057847686baaee6cc (commit)
via 41372eb0088174d02505f657f0fa2dabbc845791 (commit)
via 75e00445b6de230493e9ee37483dd4c469db29b1 (commit)
via 916cf89b440fd13a9b9c055d817b34d339442ea3 (commit)
via 6d9ac912d421951ec363e40fbcfde2428aa2f8d9 (commit)
via 7c7dc19ffa0a20fff6d97e51c874bfaca9596b24 (commit)
via 554873d2fb3aa095caaa6fece1c2321008a85b24 (commit)
via 7a98a4695a031c4b7b07d7244f3f293db7ebe0fc (commit)
via 63cfe7a9b391e1a07c6c6c8b0fab10b1c875f1be (commit)
via fd1b1b760f96e5c86e70dd8eb2e629b55f55fe55 (commit)
via a84b665349051a06df5728f435203c8353b5795a (commit)
via 75c5b123e0b4cbfebed9b15364a97c2209f94740 (commit)
via 4d0d27f83183b6659a570ae1fc07f95aefe0b23e (commit)
via 6fe6390690471cee8ba23984e3560fc4ced8b180 (commit)
via e3da56d96e191df11444877ed1989bd8f34bfa5a (commit)
from 51549f93489f5d57f71b7767528ee7dec9079fb6 (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 f9ff1c5444f7030fa0b372446bd40d4feed203c8
Author: radhika <radhika at curoverse.com>
Date: Mon Jun 5 20:40:46 2017 -0400
9587: sort the trash page rows by trash_at timestamp
diff --git a/apps/workbench/app/controllers/trash_items_controller.rb b/apps/workbench/app/controllers/trash_items_controller.rb
index 31581bb..7d60f50 100644
--- a/apps/workbench/app/controllers/trash_items_controller.rb
+++ b/apps/workbench/app/controllers/trash_items_controller.rb
@@ -16,7 +16,7 @@ class TrashItemsController < ApplicationController
trashed_items
if @objects.any?
- @objects = @objects.sort_by { |obj| obj.created_at }.reverse
+ @objects = @objects.sort_by { |obj| obj.trash_at }.reverse
@next_page_filters = next_page_filters('<=')
@next_page_href = url_for(partial: :trash_rows,
filters: @next_page_filters.to_json)
@@ -29,6 +29,27 @@ class TrashItemsController < ApplicationController
@next_page_href
end
+ def next_page_filters nextpage_operator
+ next_page_filters = @filters.reject do |attr, op, val|
+ (attr == 'trash_at' and op == nextpage_operator) or
+ (attr == 'uuid' and op == 'not in')
+ end
+
+ if @objects.any?
+ last_trash_at = @objects.last.trash_at
+
+ last_uuids = []
+ @objects.each do |obj|
+ last_uuids << obj.uuid if obj.trash_at.eql?(last_trash_at)
+ end
+
+ next_page_filters += [['trash_at', nextpage_operator, last_trash_at]]
+ next_page_filters += [['uuid', 'not in', last_uuids]]
+ end
+
+ next_page_filters
+ end
+
def trashed_items
# API server index doesn't return manifest_text by default, but our
# callers want it unless otherwise specified.
diff --git a/apps/workbench/app/views/trash_items/_show_recent.html.erb b/apps/workbench/app/views/trash_items/_show_recent.html.erb
index 6776e7a..4d9be07 100644
--- a/apps/workbench/app/views/trash_items/_show_recent.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_recent.html.erb
@@ -38,8 +38,8 @@
<tr class="contain-align-left">
<th></th>
<th>Name</th>
- <th>Created at</th>
<th>Trashed at</th>
+ <th>Created 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 8db21ed..4cc16f6 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
@@ -8,9 +8,9 @@
<td>
<%= if !obj.name.blank? then obj.name else obj.uuid end %>
<td>
- <%= render_localized_date(obj.created_at) if obj.created_at %>
- <td>
<%= render_localized_date(obj.trash_at) if obj.trash_at %>
+ <td>
+ <%= render_localized_date(obj.created_at) if obj.created_at %>
</td>
<td>
<%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
commit cc77c62e148a632c5b690c275fd9fbf659ad2715
Merge: 51549f9 55315b6
Author: radhika <radhika at curoverse.com>
Date: Mon Jun 5 20:29:18 2017 -0400
Merge branch 'master' into 9587-trash-page
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list