[ARVADOS] updated: 80f755b89c729a2772e9e5f5a6b23f20552f8211
Git user
git at public.curoverse.com
Mon Jun 26 10:28:09 EDT 2017
Summary of changes:
.../app/assets/javascripts/edit_collection_tags.js | 68 +++++++++++++++++
.../app/assets/stylesheets/collections.css.scss | 4 +
.../app/controllers/collections_controller.rb | 29 ++++++-
.../app/views/collections/_show_files.html.erb | 2 +-
.../app/views/collections/_show_tag_rows.html.erb | 31 ++++++++
.../app/views/collections/_show_tags.html.erb | 48 ++++++++++++
.../app/views/collections/save_tags.js.erb | 3 +
apps/workbench/app/views/collections/tags.js.erb | 1 +
apps/workbench/config/routes.rb | 2 +
.../controllers/collections_controller_test.rb | 85 ++++++++++++++++++++-
.../workbench/test/integration/collections_test.rb | 88 ++++++++++++++++++++++
sdk/cwl/arvados_cwl/arvjob.py | 20 +++--
sdk/cwl/tests/test_job.py | 8 ++
services/api/test/fixtures/collections.yml | 18 +++++
services/api/test/fixtures/links.yml | 14 ++++
.../arvnodeman/computenode/driver/gce.py | 4 +
services/nodemanager/arvnodeman/jobqueue.py | 2 +
services/nodemanager/arvnodeman/nodelist.py | 2 +-
.../nodemanager/arvnodeman/test/fake_driver.py | 59 ++++++++++++++-
.../{fake.cfg.template => fake_azure.cfg.template} | 0
.../{fake.cfg.template => fake_ec2.cfg.template} | 44 ++---------
.../{fake.cfg.template => fake_gce.cfg.template} | 49 ++----------
services/nodemanager/tests/integration_test.py | 49 +++++++++---
.../service/crunch-dispatch-local/run-service | 8 +-
.../lib/arvbox/docker/service/sdk/run-service | 2 +
25 files changed, 536 insertions(+), 104 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/edit_collection_tags.js
create mode 100644 apps/workbench/app/views/collections/_show_tag_rows.html.erb
create mode 100644 apps/workbench/app/views/collections/_show_tags.html.erb
create mode 100644 apps/workbench/app/views/collections/save_tags.js.erb
create mode 100644 apps/workbench/app/views/collections/tags.js.erb
copy services/nodemanager/tests/{fake.cfg.template => fake_azure.cfg.template} (100%)
copy services/nodemanager/tests/{fake.cfg.template => fake_ec2.cfg.template} (78%)
rename services/nodemanager/tests/{fake.cfg.template => fake_gce.cfg.template} (77%)
via 80f755b89c729a2772e9e5f5a6b23f20552f8211 (commit)
via 50dba76531ad4fdd5ab79598aa192dd3bb1be314 (commit)
via d51c47d291aec2609bff80c7ef8bd6417b651e7a (commit)
via a4127e018442e1b8053307f376c2d8c66b3279fc (commit)
via b6244435a4470fbddc9f13edb4329d563e579e50 (commit)
via cffa37b8680c2730934b7f474836312bb7a1fe73 (commit)
via aee74220328be12113ea597e593b4ab6f120aeac (commit)
via 55bdcab45a5e059ecc218099a30ff5ad231a627f (commit)
via ecc8ee4e5edabaf7d888f55a99184b1efe4a9060 (commit)
via b17b7dd25a7daea501538419fadfd79b46a72aeb (commit)
via 2e1d7b1356e2063c2fbd6a1bf26176ebbcb4e63c (commit)
via cabba9a1b8046d1c75c302659cc23de59689ce69 (commit)
via d53b4de9b3b23d8fec31be0254a9a0ec4355884a (commit)
via e6a720d548ea851e5db9970f013456c8daeb35fc (commit)
from 7415bc3f7239b5c062e3876681265912d8150edd (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 80f755b89c729a2772e9e5f5a6b23f20552f8211
Merge: 7415bc3 50dba76
Author: radhika <radhika at curoverse.com>
Date: Mon Jun 26 10:26:53 2017 -0400
Merge branch 'master' into 11840-unique-constraint-untrash-coll
Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>
Conflicts:
services/api/test/fixtures/collections.yml
diff --cc services/api/test/fixtures/collections.yml
index dcb8c14,6543f54..2403060
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@@ -657,33 -657,24 +657,51 @@@ collection_to_remove_and_rename_files
manifest_text: ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:file1 0:0:file2\n"
name: collection to remove and rename files
+ collection_with_tags_owned_by_active:
+ uuid: zzzzz-4zz18-taggedcolletion
+ portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-02-03T17:22:54Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
+ modified_at: 2014-02-03T17:22:54Z
+ updated_at: 2014-02-03T17:22:54Z
+ manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
+ name: collection with tags
+ properties:
+ tags:
+ existing tag 1: value for existing tag 1
+ existing tag 2: value for existing tag 2
+ some other property: value for the other property
+
+trashed_collection_to_test_name_conflict_on_untrash:
+ uuid: zzzzz-4zz18-trashedcolnamec
+ portable_data_hash: 80cf6dd2cf079dd13f272ec4245cb4a8+48
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-02-03T17:22:54Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
+ modified_at: 2014-02-03T17:22:54Z
+ updated_at: 2014-02-03T17:22:54Z
+ manifest_text: ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:file1 0:0:file2\n"
+ name: same name for trashed and persisted collections
+ is_trashed: true
+ trash_at: 2001-01-01T00:00:00Z
+ delete_at: 2038-01-01T00:00:00Z
+
+same_name_as_trashed_coll_to_test_name_conflict_on_untrash:
+ uuid: zzzzz-4zz18-namesameastrash
+ portable_data_hash: 80cf6dd2cf079dd13f272ec4245cb4a8+48
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-02-03T17:22:54Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
+ modified_at: 2014-02-03T17:22:54Z
+ updated_at: 2014-02-03T17:22:54Z
+ manifest_text: ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:file1 0:0:file2\n"
+ name: same name for trashed and persisted collections
+
+
# Test Helper trims the rest of the file
# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list