[ARVADOS] updated: abd564475c86af3359677af700b1d51667fd5c73
git at public.curoverse.com
git at public.curoverse.com
Wed Mar 25 13:17:14 EDT 2015
Summary of changes:
.../views/application/_selection_checkbox.html.erb | 1 +
.../app/views/collections/_show_files.html.erb | 4 +-
doc/api/schema/User.html.textile.liquid | 1 +
services/api/app/models/user.rb | 212 +++++++-------
.../20150317132720_add_username_to_users.rb | 127 ++++++++
services/api/db/structure.sql | 16 +-
services/api/test/fixtures/users.yml | 12 +
services/api/test/unit/user_test.rb | 324 +++++++++++----------
8 files changed, 435 insertions(+), 262 deletions(-)
create mode 100644 services/api/db/migrate/20150317132720_add_username_to_users.rb
via abd564475c86af3359677af700b1d51667fd5c73 (commit)
via a230c4112a6b721882dee7e90a582a0f7c62eb3e (commit)
via febb804129f39963722e530a394f36367220d4b5 (commit)
via 9cb7b08709aec196d7cd2170ec60134f2253d46b (commit)
via 9aa1156989884e2e5d07dba055c1a16aac25b1c3 (commit)
via ff8721dd5854279fab712f4a4ff8aed2256c1b87 (commit)
from 8505cb4000d7e1c776cbc7ea630d9413616f49c3 (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 abd564475c86af3359677af700b1d51667fd5c73
Merge: a230c41 febb804
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Mar 25 13:15:54 2015 -0400
Merge branch 'master' into 5420-collection-checkbox-selections
commit a230c4112a6b721882dee7e90a582a0f7c62eb3e
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Mar 25 13:15:11 2015 -0400
5420: address checkbox selection caching issue with Safari and Chrome.
diff --git a/apps/workbench/app/views/application/_selection_checkbox.html.erb b/apps/workbench/app/views/application/_selection_checkbox.html.erb
index a234e9f..47e1dfd 100644
--- a/apps/workbench/app/views/application/_selection_checkbox.html.erb
+++ b/apps/workbench/app/views/application/_selection_checkbox.html.erb
@@ -11,6 +11,7 @@
fn = String.new fn %>
<%= check_box_tag 'uuids[]', object.uuid, false, {
:class => 'persistent-selection',
+ :id => object.uuid,
:friendly_type => object.class.name,
:friendly_name => fn,
:href => "#{url_for controller: object.class.name.tableize, action: 'show', id: object.uuid }",
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 8dcef33..cdc94c4 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -43,7 +43,7 @@ function unselect_all_files() {
</div>
</div>
<div class="pull-right">
- <input class="form-control filterable-control" data-filterable-target="ul#collection_files" id="file_regex" name="file_regex" placeholder="filename regex" type="text"/>
+ <input class="form-control filterable-control" data-filterable-target="ul#collection_files" id="file_regex" name="file_regex" placeholder="filename regex" type="text" autocomplete="off"/>
</div>
</div>
<p/>
@@ -90,6 +90,8 @@ function unselect_all_files() {
:href => url_for(controller: 'collections', action: 'show_file',
uuid: @object.portable_data_hash, file: file_path),
:title => "Include #{file_path} in your selections",
+ :id => index,
+ :autocomplete => "off",
} %>
<span> </span>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list