[ARVADOS] updated: 58997b4550660886fa4b402a4079267607380eda
git at public.curoverse.com
git at public.curoverse.com
Thu May 7 15:41:28 EDT 2015
Summary of changes:
apps/workbench/app/assets/images/mouse-move.gif | Bin 26082 -> 26082 bytes
.../app/assets/javascripts/selection.js.erb | 8 +
.../app/views/collections/_show_files.html.erb | 16 +-
.../app/views/projects/_show_tab_contents.html.erb | 16 +-
docker/sso/Dockerfile | 1 +
docker/sso/application.yml.in | 26 +++
services/api/app/models/node.rb | 7 +-
services/api/config/application.default.yml | 7 +
services/crunchstat/crunchstat.go | 8 +-
services/keepstore/handlers.go | 47 +++---
services/keepstore/keepstore.go | 6 +-
services/keepstore/keepstore_test.go | 8 +-
services/keepstore/pull_worker_integration_test.go | 19 ++-
services/keepstore/pull_worker_test.go | 17 +-
services/keepstore/volume.go | 3 +-
services/keepstore/volume_test.go | 18 +-
services/keepstore/volume_unix.go | 187 +++++++--------------
services/keepstore/volume_unix_test.go | 15 +-
services/nodemanager/arvnodeman/daemon.py | 8 +-
services/nodemanager/tests/test_daemon.py | 37 ++++
20 files changed, 232 insertions(+), 222 deletions(-)
create mode 100644 docker/sso/application.yml.in
via 58997b4550660886fa4b402a4079267607380eda (commit)
via dc00995b1843cd1decebffe1493e55a16c3c0df9 (commit)
via fde21d34d011af2123668983c559632221390fd4 (commit)
via e6c90436e715fd6da88782cbe3f72bd6c2443036 (commit)
via cc303a0ef797c1c752b4fd86e48e2c84fc7d96ca (commit)
via 200f7004f921a68ec40b407dfe31f1db95e98fb9 (commit)
via 02e1074d6020151e9854027df0ca218acb12fa29 (commit)
via b6f54ccb32e05348e9a5c76c7ed3211203cd4e55 (commit)
via d0f98546e68f6f7a714367d0bdbcc468ce217f3e (commit)
via e7a2db3fe3446929a481f20e1358337ada500c72 (commit)
via b9024e06795906fa74925065cef81d094af95fc0 (commit)
via 6bd5a4e01a768df4078ddf77862751ea86435e7b (commit)
via 88b0204247e448ba5f715cb01adba4597bb6aae7 (commit)
via e81a3e9b46d0c7500079df3959e07074068ceb1b (commit)
via 42b7aeb02200285fe3390eefa48be28baee3ca58 (commit)
via e7e61999bf577b3ba5308c747dda4a0011516aa7 (commit)
via b988327f1fe531cc0e1f1cde73d2b18c05850548 (commit)
via 0358074100610abe13cac98b82cbeca4326af986 (commit)
via ae6b514a98d89ce0bdfd47edd4508c42761cb049 (commit)
from 3e48f1c6d32cf1694af48ae2d6f182cfe5a6c73b (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 58997b4550660886fa4b402a4079267607380eda
Author: Radhika Chippada <radhika at curoverse.com>
Date: Thu May 7 15:21:11 2015 -0400
4467: Move select_all_items and unselect_all_items methods into selection.js
diff --git a/apps/workbench/app/assets/javascripts/selection.js.erb b/apps/workbench/app/assets/javascripts/selection.js.erb
index 55df786..5c69c50 100644
--- a/apps/workbench/app/assets/javascripts/selection.js.erb
+++ b/apps/workbench/app/assets/javascripts/selection.js.erb
@@ -86,3 +86,11 @@ $(document).
on('click', dispatch_selection_action);
$(this).trigger('selections-updated');
});
+
+function select_all_items() {
+ $(".arv-selectable-items :checkbox").filter(":visible").prop("checked", true).trigger("change");
+}
+
+function unselect_all_items() {
+ $(".arv-selectable-items :checkbox").filter(":visible").prop("checked", false).trigger("change");
+}
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 26e71c8..e3c79f1 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,13 +1,3 @@
-<script>
-function select_all_files() {
- $("#collection_files :checkbox").filter(":visible").prop("checked", true).trigger("change");
-}
-
-function unselect_all_files() {
- $("#collection_files :checkbox").filter(":visible").prop("checked", false).trigger("change");
-}
-</script>
-
<%
preview_selectable_container = ''
preview_selectable = ''
@@ -38,8 +28,8 @@ function unselect_all_files() {
</ul>
</div>
<div class="btn-group btn-group-sm">
- <button id="select-all" type="button" class="btn btn-default" onClick="select_all_files()">Select all</button>
- <button id="unselect-all" type="button" class="btn btn-default" onClick="unselect_all_files()">Unselect all</button>
+ <button id="select-all" type="button" class="btn btn-default" onClick="select_all_items()">Select all</button>
+ <button id="unselect-all" type="button" class="btn btn-default" onClick="unselect_all_items()">Unselect all</button>
</div>
</div>
<div class="pull-right">
@@ -53,7 +43,7 @@ function unselect_all_files() {
<% if file_tree.nil? or file_tree.empty? %>
<p>This collection is empty.</p>
<% else %>
- <ul id="collection_files" class="collection_files <%=preview_selectable_container%>">
+ <ul id="collection_files" class="collection_files arv-selectable-items <%=preview_selectable_container%>">
<% dirstack = [file_tree.first.first] %>
<% file_tree.take(10000).each_with_index do |(dirname, filename, size), index| %>
<% file_path = CollectionsHelper::file_path([dirname, filename]) %>
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 372b9d9..a33a1cf 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -1,13 +1,3 @@
-<script>
-function select_all_files() {
- $(".arv-project-contents :checkbox").filter(":visible").prop("checked", true).trigger("change");
-}
-
-function unselect_all_files() {
- $(".arv-project-contents :checkbox").filter(":visible").prop("checked", false).trigger("change");
-}
-</script>
-
<% sortable_columns = {} if local_assigns[:sortable_columns].nil? %>
<div class="selection-action-container">
<div class="row">
@@ -82,8 +72,8 @@ function unselect_all_files() {
</ul>
</div>
<div class="btn-group btn-group-sm">
- <button id="select-all" type="button" class="btn btn-default" onClick="select_all_files()">Select all</button>
- <button id="unselect-all" type="button" class="btn btn-default" onClick="unselect_all_files()">Unselect all</button>
+ <button id="select-all" type="button" class="btn btn-default" onClick="select_all_items()">Select all</button>
+ <button id="unselect-all" type="button" class="btn btn-default" onClick="unselect_all_items()">Unselect all</button>
</div>
</div>
<div class="col-sm-4 pull-right">
@@ -91,7 +81,7 @@ function unselect_all_files() {
</div>
</div>
- <table class="table table-condensed arv-index arv-project-contents arv-project-<%= tab_pane %>">
+ <table class="table table-condensed arv-index arv-selectable-items arv-project-<%= tab_pane %>">
<colgroup>
<col width="0*" style="max-width: fit-content;" />
<col width="0*" style="max-width: fit-content;" />
commit dc00995b1843cd1decebffe1493e55a16c3c0df9
Merge: 3e48f1c fde21d3
Author: Radhika Chippada <radhika at curoverse.com>
Date: Thu May 7 14:29:28 2015 -0400
Merge branch 'master' into 4467-project-contents-select-all
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list