[ARVADOS] updated: 40b15ddcdcb8314f0a1036de6238d0ca4bfb3e41
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 19 15:36:48 EDT 2014
Summary of changes:
apps/workbench/Gemfile | 2 +-
apps/workbench/Gemfile.lock | 4 +-
.../javascripts/{selection.js => selection.js.erb} | 17 ++-
apps/workbench/app/assets/javascripts/tab_panes.js | 8 ++
.../app/controllers/actions_controller.rb | 8 +-
.../app/controllers/projects_controller.rb | 75 ++++++++--
.../app/controllers/user_agreements_controller.rb | 2 +-
apps/workbench/app/models/arvados_base.rb | 6 +
apps/workbench/app/models/collection.rb | 4 +
apps/workbench/app/models/group.rb | 4 +
apps/workbench/app/models/job.rb | 19 ++-
apps/workbench/app/models/pipeline_instance.rb | 6 +-
apps/workbench/app/models/pipeline_template.rb | 4 +
.../views/application/_arvados_attr_value.html.erb | 2 +-
.../app/views/application/_content.html.erb | 33 ++---
.../views/application/_job_status_label.html.erb | 2 +-
.../application/_name_and_description.html.erb | 12 ++
.../workbench/app/views/application/destroy.js.erb | 1 +
apps/workbench/app/views/application/show.html.erb | 42 ++++++
.../app/views/collections/_show_files.html.erb | 45 ++++--
.../app/views/collections/_show_recent.html.erb | 21 +++
.../collections/_show_source_summary.html.erb | 5 +-
apps/workbench/app/views/collections/show.html.erb | 21 +--
.../app/views/pipeline_instances/show.html.erb | 22 +--
.../views/pipeline_templates/_show_recent.html.erb | 3 +-
.../app/views/pipeline_templates/show.html.erb | 3 +-
.../app/views/projects/_show_tab_contents.html.erb | 12 +-
.../app/views/projects/remove_items.js.erb | 7 +-
apps/workbench/app/views/projects/show.html.erb | 28 +---
.../workbench/app/views/projects/tab_counts.js.erb | 3 +
apps/workbench/config/application.default.yml | 29 ++++
apps/workbench/config/database.yml | 7 +
apps/workbench/config/routes.rb | 2 +
apps/workbench/test/diagnostics/pipeline_test.rb | 93 ++++++++++++
apps/workbench/test/diagnostics_test_helper.rb | 29 ++++
.../test/functional/actions_controller_test.rb | 30 ++++
.../workbench/test/integration/collections_test.rb | 89 +++++++++++-
apps/workbench/test/integration/jobs_test.rb | 29 ++++
.../test/integration/pipeline_instances_test.rb | 22 ++-
.../test/integration/pipeline_templates_test.rb | 31 ++++
apps/workbench/test/integration/projects_test.rb | 36 ++++-
apps/workbench/test/integration_helper.rb | 6 +-
apps/workbench/test/test_helper.rb | 7 +-
crunch_scripts/split-fastq.py | 7 +-
doc/_includes/_example_sdk_go.liquid | 109 ++++++++++++++
doc/_includes/_example_sdk_go_imports.liquid | 4 +
doc/sdk/go/index.html.textile.liquid | 52 +------
...nning-pipeline-command-line.html.textile.liquid | 12 +-
docker/java-bwa-samtools/Dockerfile | 5 +-
sdk/cli/bin/arv-run-pipeline-instance | 104 ++++++++++----
sdk/cli/bin/crunch-job | 39 +++--
sdk/python/arvados/collection.py | 154 ++++++++++++--------
sdk/python/arvados/commands/_util.py | 12 ++
sdk/python/arvados/commands/keepdocker.py | 55 ++++---
sdk/python/arvados/commands/put.py | 45 +++---
sdk/python/arvados/keep.py | 156 +++++++++++---------
sdk/python/arvados/retry.py | 18 +++
sdk/python/arvados/stream.py | 68 +++++----
sdk/python/arvados/util.py | 4 +-
sdk/python/bin/arv-get | 46 +++---
sdk/python/bin/arv-ls | 21 +--
sdk/python/setup.py | 2 +-
sdk/python/tests/arvados_testutil.py | 11 ++
sdk/python/tests/test_arv_put.py | 8 +-
sdk/python/tests/test_collections.py | 143 +++++++++++++++++-
sdk/python/tests/test_keep_client.py | 69 ++++-----
sdk/python/tests/test_retry.py | 27 ++++
sdk/python/tests/test_stream.py | 117 +++++++++++++++
services/api/Gemfile | 4 +-
services/api/Gemfile.lock | 8 +-
.../app/controllers/arvados/v1/jobs_controller.rb | 10 +-
.../controllers/arvados/v1/schema_controller.rb | 1 +
services/api/app/models/collection.rb | 3 +
services/api/app/models/job.rb | 1 +
services/api/app/models/node.rb | 11 +-
services/api/app/models/pipeline_instance.rb | 1 +
services/api/config/application.default.yml | 3 +
services/api/config/routes.rb | 1 +
...d_description_to_pipeline_instances_and_jobs.rb | 11 ++
...140918141529_change_user_owner_uuid_not_null.rb | 12 ++
.../20140918153541_add_properties_to_node.rb | 9 ++
services/api/db/structure.sql | 22 +--
services/api/lib/tasks/config_check.rake | 4 +
services/api/script/crunch-dispatch.rb | 84 ++++++-----
services/api/test/fixtures/collections.yml | 26 ++++
services/api/test/fixtures/users.yml | 1 +
.../arvados/v1/collections_controller_test.rb | 57 ++++++++
.../functional/arvados/v1/jobs_controller_test.rb | 28 +++-
.../functional/arvados/v1/nodes_controller_test.rb | 8 +-
.../arvados/v1/schema_controller_test.rb | 7 +
services/api/test/unit/node_test.rb | 8 +-
services/fuse/arvados_fuse/__init__.py | 122 ++++++++++------
services/fuse/bin/arv-mount | 66 +++++----
services/fuse/setup.py | 2 +-
services/fuse/tests/test_mount.py | 13 +-
services/keepstore/block_work_list.go | 160 +++++++++++++++++++++
services/keepstore/block_work_list_test.go | 149 +++++++++++++++++++
services/keepstore/handler_test.go | 13 +-
services/keepstore/handlers.go | 24 +++-
services/keepstore/keepstore.go | 3 +-
services/keepstore/pull_list/pull_list.go | 81 -----------
101 files changed, 2319 insertions(+), 753 deletions(-)
rename apps/workbench/app/assets/javascripts/{selection.js => selection.js.erb} (93%)
create mode 100644 apps/workbench/app/views/application/_name_and_description.html.erb
create mode 100644 apps/workbench/app/views/projects/tab_counts.js.erb
create mode 100644 apps/workbench/test/diagnostics/pipeline_test.rb
create mode 100644 apps/workbench/test/diagnostics_test_helper.rb
create mode 100644 apps/workbench/test/integration/jobs_test.rb
create mode 100644 doc/_includes/_example_sdk_go.liquid
create mode 100644 doc/_includes/_example_sdk_go_imports.liquid
create mode 100644 sdk/python/tests/test_stream.py
create mode 100644 services/api/db/migrate/20140911221252_add_description_to_pipeline_instances_and_jobs.rb
create mode 100644 services/api/db/migrate/20140918141529_change_user_owner_uuid_not_null.rb
create mode 100644 services/api/db/migrate/20140918153541_add_properties_to_node.rb
create mode 100644 services/keepstore/block_work_list.go
create mode 100644 services/keepstore/block_work_list_test.go
delete mode 100644 services/keepstore/pull_list/pull_list.go
via 40b15ddcdcb8314f0a1036de6238d0ca4bfb3e41 (commit)
via 7178ac911e7b160c1348da404b5aa07b9829d3c8 (commit)
via fe59fe52fd8d10f79b863022dbac6426082dfa46 (commit)
via f5fd953bdf34b6a6b7ba698f76b54f21ee47afc8 (commit)
via 5bb258b6e289b97e4bda28ff1b2d50a255339030 (commit)
via 9d724d2028cc942b02f5a3846fc25d46761ce136 (commit)
via 67182ab96a8dda99ffa897a2fb04d361cd73777d (commit)
via 96f5b2d78c60d1a16f51a269270d180b3f9a60a3 (commit)
via 3b10b48b8a76203f75bee5233e3ab8a258803cb9 (commit)
via c23de360ed9e7950d8587a3ddae3c35874e61b50 (commit)
via 84e9ab15e2068b0e0384e05d3839d16b6a71dc51 (commit)
via 4ac75eb713fcd03b45eb1b4929e21897b4aa871b (commit)
via a4ab52b4305023d8c679cc7c3b09361050d167b6 (commit)
via 1da127f1e63485ac225cb16511013094fd7e84f6 (commit)
via 876d1f80e0344989f8b68799918c467fa5a52e19 (commit)
via eb3c3c9eeb73529353ee385385865d6d3dc99913 (commit)
via 8ba7f9450ce51aa4ec8b0944991abe5a692ab4d1 (commit)
via 1f45f7666edec7b10cee415f238931744247b762 (commit)
via cf9b56161704477075cda297b44dae4d9342c24a (commit)
via 1f354e0ba1b5b23c2d36c0cb60451260b29e1d3f (commit)
via 80c57e3536f41d8419f580b577776d85209f6111 (commit)
via 5a9aaf3f32fc0414ae16aed17a77388cf4af9f90 (commit)
via af2c75821456e28875dc8006efb03f38ec1a74b8 (commit)
via 9facc2aeba6770ee80730001ca66bdaec8bde738 (commit)
via 8d554a2734be8bbe015d38a48494f7699f2de439 (commit)
via f51c721f97c6e5ef4fda47e6d0fc45cdd2c2b77d (commit)
via 4154420cdd2a2ac6cdb2cc57357f42513fb287cc (commit)
via 58ccc8f13d66fc3da1aecb392a6698a29958e203 (commit)
via 4c8ec1b2166a81b05b2b6cf5a6fae5b839876802 (commit)
via 403d9f6b700f38cd3caf067445233b5ead99466c (commit)
via 355b679d30f9d3f7f7b1619a4b807d18daaf9483 (commit)
via 274ca7a6c2f1f600de4242eee6cb4e8465d4440c (commit)
via 26f139f761174328ea43114a3ef9cb9ad873149a (commit)
via 4cf16efd4dc5097b59e900d84eef3bf98d80b16f (commit)
via 4c80f6b8856accfe6017bab4f66d018353986dbc (commit)
via 9d11f5c700cc7b44bd592eeb80abef1fa9f5d45e (commit)
via 5563150b747beb8ed580d74df4423c4bc2e37aca (commit)
via 3ef64886e9646804ab1c7e06cb5f3b24bbcba651 (commit)
via a9f3e9ce8853d574e9f1aafed61085b66eb09702 (commit)
via dce0ccabe3d9fab6943e89dc84050793cca5b553 (commit)
via aee63d7cbb2f8e39b417baebc145889d6290315e (commit)
via fc2096f2825082d526a0d98323690a09ea9a5889 (commit)
via 2d04e7d3466cfbf166aecfde71dea909ad0b9119 (commit)
via 9ad5b41bb28617a014410afde9eb90f758f491ef (commit)
via c99ba4cdc8f6ff0be1847ffe4ec6f791f6b83396 (commit)
via 2df94bb061c94971288736299fa09357236bd13b (commit)
via 66cba099dbc0c588fe676c029f5981ed6143c973 (commit)
via 210d762a82c4fe3a2445c641513188fce07436e6 (commit)
via 21cdd10032c60451743b6e6294d2e75a356ee61c (commit)
via f1603177aa4cf91a91528f8705b33fc3e5bef2fa (commit)
via 1431ecfb847926e6594f9b5f5ece635609721891 (commit)
via 2da969ccdb4f402a44065ad36a36f915e2c44629 (commit)
via 517d3fca54225873d36f94083f3b7056ce271f46 (commit)
via d8f97ca48cd194895fedbefbaa022196d25828f8 (commit)
via 6f2433691034b6e223445c5a047554ee7c6f92c1 (commit)
via aad2f86f509b34f1507bd5530bc458daf14feb41 (commit)
via 0a5f8b68dbc86519f1faa10d1597c47776bb80dd (commit)
via 735f1ed1f3c9bf4d876981ccd94a0ad723300d18 (commit)
via 283a6c020649948fe9164c851836a171800afadd (commit)
via 37ab78a4c99a7b8534556881e6eb77d335abd9e3 (commit)
via d60536bb1ca0eb6e72388a5287e786725dbdfd9e (commit)
via 1f1963df75f584d575fd440206e3ac64064cf06c (commit)
via 2749cf271f44f3783a3c2c9c309e0508da7d9446 (commit)
via 4cfb296612f7b483b56c36f119ca175def706d2f (commit)
via b4d7d4a3144a84ac2332b94fb12047cb57dcc572 (commit)
via 787c47f7e1b2e9cdc4236c3052e34125259feb7f (commit)
via 87163a6ec678b841ced3824cbbe40ac20544821b (commit)
via 452baf1ec1b55c6c4613972ee5f6b5ebf28e8ed7 (commit)
via 82c5dcae45765d61f9af973bb3c02f878aa40804 (commit)
via 391c3551e763834bdc4c18db8051905d2c338f83 (commit)
via db9ccbd2fab6edf279408a6869a2cf2409d5f335 (commit)
via b941bb69fdf0bfd2cc2ce0de82f570e70f7af86c (commit)
via ec3e655812817f4d7935629f397d0508f961bd9e (commit)
via 869c692dfabba2ade6db0fea518e1fed8d2b8a53 (commit)
via c49db117daf8993185cb271ea90d89e841e01117 (commit)
via 63af4052e2899a275930678bda65d82e857e1a39 (commit)
via a6f8d9e254b27305f8f61adc04b685206531237e (commit)
via 91fe76f4a3f8e5f59d12343ae69d2ba5a43d8e55 (commit)
via 1245c7955eefc1bb4171d7d80dd6f0cac1f0676a (commit)
via c8b329a7764af3094d46b79441b9f9b07605abb2 (commit)
via 9d1876405f50e009b686bce51c2469a52d2f79ca (commit)
via 19ba184b0a37d93b5ef5679be8bcc72417887d62 (commit)
via 700fcdd3594713fc2f692d5c3c31474f0c8e14ff (commit)
via 454e8fd7bbe6afdfd5fe9905cd0376741bf5f9a0 (commit)
via 46ad2015c1db3662a1ece565df06acbbfd7ee7ec (commit)
via facb6375180b37b628c417e97a181abe71e3181c (commit)
via 3babb86cbbb3275d55b1cb928248d0cff436fb3f (commit)
via d35d434047cf36206ec5780e2d422bc0f4f84ea4 (commit)
via aa1e4c45da76894d64199acb89efdc50b8bb7756 (commit)
via 9f34059300412b551a21bb8ef8bae1ffa28cf9dc (commit)
via 46f5403fdd2b3b0bd26d81d81ba509c624f54bb3 (commit)
via 6d5e04a731edc9ce8944ecea637070afbdadeb05 (commit)
via 4dedb0cc8921e7210ed245107b83996eb0d4e974 (commit)
via 642670d6614fe30f3ad4248f8415a290c6c3ad45 (commit)
via bc7b64beb18c4b8900a9d14f9539b184ef37cb64 (commit)
via ac79a0b185c3f9bf163c7685040e49c59825e17a (commit)
via 1065f68b84a650980cbcc1e0dd51b587d075f06b (commit)
via 5df584b3e49ccb52419449da016d86b08510f959 (commit)
via 7faaccf29475d419f55fe43e53dffd40392f48fa (commit)
via 672df7ed5ffe0aae1eaa948438de9d54aed61038 (commit)
via 289f610d23d5fcb0e9deacea90e67e3f36b41077 (commit)
via bf243e064a7a2ee4e69a87dc3ba46e949a545150 (commit)
via bf775ee6fbbfec9b7d8736aea57dcb0f2b770f60 (commit)
via 7a260be18ddba67443a2be19d7f24406c7fe5131 (commit)
via 4c4c295193379003fa6c94c9c06e3bdec574e265 (commit)
via 9a88a95c52bf3b1da8152ab382de5b78be8568eb (commit)
via a6e1c4ee0d72d0b3f5443dcf309135a4d609c0c2 (commit)
via 0119bfdc48c03588e91a9fdbafe77bfd62d89c20 (commit)
via fcf7b0770eb45beb57f32f7855aa76e9bf28690c (commit)
via ff9f9c7e1a664a36bcffd54c7269c08d5bf1d436 (commit)
via f43a783466bf8257781bac0acfa14008b2d532a1 (commit)
via b53be4b88fce28f4aa08da8d869653fcb7edb062 (commit)
via 45f25c3c3db844e2fa54d0d8761607ecc4304149 (commit)
via 96d9f313205dcc038a50c25a3ffdacd6516f62bf (commit)
via 4bde33a6a4ad1390504e270ee2ea881a867b5d5b (commit)
via c78412ea3d188e3e035b285d10f89cf592b21071 (commit)
via e5152a25b9f9803522c15ff6397545f68d1d07a2 (commit)
via 132db914689be8338c16ea3d6748d073af2a6240 (commit)
via 32b97aec0d210ec7a951f441cc6a44b4d0921a90 (commit)
via a31f94b1b433964c1481c384f2989392321d5529 (commit)
via b9ce584056c53253ef5c8fd19f30c20cb521b0b8 (commit)
via ac594f16176901b7692be354045226e093b14218 (commit)
via 00a0690c32f29f7d2c1b6030dd01578d98ea6dd6 (commit)
via 2109516cd314190311d837fcf40576c87dd38cd1 (commit)
via 0cf2f356035164cd92e4a5722f0dd25c7502164e (commit)
via f6ea610fcc842abdbc9cfe2dd10a64debc81ac1a (commit)
via 946aeb2debef9cb5fc3c4b557a2973b36f6d3750 (commit)
via 893f659712cd9b742829b17e2cedc822901608ec (commit)
via 451e52c2a7a6ead01e5ebca28e09dd02fcba49da (commit)
via 555c1e920855989e059a4be0503ebb627193f987 (commit)
via bc8c85ca59ff590ae2e336fc4552ec265d5ebb50 (commit)
via a9619cd9d563b5c434da6a11566517cacb410124 (commit)
via 8012f6cc74ca6e39d6f4bbf097a66eee19f0c4da (commit)
via 2d911a46e2698f18200bf2170bdb4c18452439a1 (commit)
via 577bd728e410d6a9b57b11578264b61220a50d76 (commit)
via 35bee4f8071099b57925a49fc56554ceda900c81 (commit)
via f2bed1a9d44ccee1a5e1214e139d586b60b90e6a (commit)
via 7082cec0e3dea1de16209b205e8fd053efa96490 (commit)
via 97d1d110d172f410214adac8a49e0c984694a016 (commit)
via aff3c1ad491cf4ce7fe7912eaf17c1109d35faf6 (commit)
via ec48719c7de0d18772b811645956fab87ce14bff (commit)
via 52ecfbd9838f9f643de1e0bd579aaa3576db565d (commit)
via 9c861f63deb10765e98dba5746aac600bd1a5096 (commit)
via 0bf498cd8a240f70517d44e3dab0fa000468531d (commit)
via b4e495d7ee3ca9f9c816dd639dd2b57d85f6a5cf (commit)
via 7ad2ce19e1db57314ff106bfcfa83f47c8daec2e (commit)
via aa22ee6471ccd426287330705ed57719004c8ac8 (commit)
via c2a7a5a0e1a89d10d286e060374ad9e1b83a24c7 (commit)
via 5ff990155f06109c55bbb832a8dd670265d3f3d1 (commit)
via 72da0be3dc47515537b89f132b0f3995b6ab132e (commit)
via 9126da70d57cdd32938c4b3814fedf2bd1f1db93 (commit)
via bdaaaf2330d43200f5e9f14172ca0591d7314aaf (commit)
via 2332fe41a097d491c7211a64d6d7c02a65952cc4 (commit)
via 735d5487e328eb51bbaaca0475e4facf6af84567 (commit)
via 9a57602cd575021709b94ea2fe80c414d482211c (commit)
via a3615da860d1d78d0ecb7e2890eea26963b5c01e (commit)
via 960925be39948cda7f6ff0775887ba411a4e82ea (commit)
via 300729d2ef4d0e7b9d86444c4a784b7e0b3beb6d (commit)
via 37cd41354dd5acccd2c0405fbe0c4a8d29a79670 (commit)
via 1eedd481146bc30cd2548c44399949cbfa2d576b (commit)
via 0bb834af65ea679d03bfe6c4e578e3d3403b8bf8 (commit)
via 7e3496abb1b8c70607df37b6f096c8acd42d714d (commit)
via 2b96f0945cfdbda223227b96393a5f77aff477a4 (commit)
via 43d6c4e398e53a43f5b52c556128a33c8f84f5a3 (commit)
via e386cf444082ac341978887fb8d2b3b13cbba060 (commit)
via 2e255fb4aa0a1b7e0acfb1298a1625629ca18846 (commit)
via 08b394b0df66374a75dab082ca858dda6e4beae3 (commit)
via 852573d60776116bed4e86431667abf8c77d3f9a (commit)
via 5faed0c0ad219bd32182ecf5029a363587d4e863 (commit)
via e7a9c2edbf0b3843940446077a45ad4c911727ab (commit)
via 34081b99f265f9baaabcd791f7c520c3f5b37f19 (commit)
via a6a9e10686e3ffc8c56b0aad61633524be7e5cc4 (commit)
via 9564076de96d8c0084cf00f47348c41d6abfe673 (commit)
via 74ac5edcb6ecff4003ec70cf904c900392a31814 (commit)
via 8c4233dae52c96ceb629d2be1be73b518118863a (commit)
via e322205a65bdc3a0565997eb68c86e74cd191762 (commit)
via fd910ade561ddec093ec29a79a216259e53bef90 (commit)
via c90d8145634022d2d0c66b36bfb99e4c21248fed (commit)
via 498f3130928f58e830be3abe74b20d06904af3cd (commit)
via 33710e325a775d8f52ce89ce365b4a5153a68b18 (commit)
via 72af8e487f399fd726b8985a346a37f2e2160ca6 (commit)
via 8a4691d711947a83e9155599e96c4173e655a8f3 (commit)
from a3f380f9dfe25c1c28e6354de56d93b5c9265a08 (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 40b15ddcdcb8314f0a1036de6238d0ca4bfb3e41
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Sep 19 15:36:34 2014 -0400
Fix Canceled -> Cancelled (american vs canadian spelling, canada wins)
diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb
index 1528bd7..1deb13a 100644
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@ -39,12 +39,12 @@ class Job < ArvadosBase
end
def self.state job
- if job.responds_to? :state
+ if job.respond_to? :state and job.state
return job.state
end
if not job[:cancelled_at].nil?
- "Canceled"
+ "Cancelled"
elsif not job[:finished_at].nil? or not job[:success].nil?
if job[:success]
"Completed"
diff --git a/apps/workbench/app/views/application/_job_status_label.html.erb b/apps/workbench/app/views/application/_job_status_label.html.erb
index c6ab8e4..86c3415 100644
--- a/apps/workbench/app/views/application/_job_status_label.html.erb
+++ b/apps/workbench/app/views/application/_job_status_label.html.erb
@@ -1,6 +1,6 @@
<% status = Job.state j %>
<% to_label = {
- "Canceled" => "danger",
+ "Cancelled" => "danger",
"Completed" => "success",
"Running" => "info",
"Failed" => "danger",
commit 7178ac911e7b160c1348da404b5aa07b9829d3c8
Merge: a3f380f fe59fe5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Sep 19 15:26:30 2014 -0400
Merge branch 'master' into 3187-pipeline-instance-page
Conflicts:
apps/workbench/app/models/job.rb
apps/workbench/app/views/application/_content.html.erb
services/api/app/models/job.rb
diff --cc apps/workbench/app/assets/javascripts/tab_panes.js
index 2295cf6,ea17f6c..cca49b2
--- a/apps/workbench/app/assets/javascripts/tab_panes.js
+++ b/apps/workbench/app/assets/javascripts/tab_panes.js
@@@ -79,5 -73,13 +79,13 @@@ $(document).on('arv:pane:reload', funct
// Mark all panes as stale/dirty. Refresh the active pane.
$(document).on('arv-log-event arv:pane:reload:all', function() {
- $('.tab-pane.loaded').trigger('arv:pane:reload');
+ $('.pane-anchor.loaded').trigger('arv:pane:reload');
});
+
+ // If there is a 'tab counts url' in the nav-tabs element then use it to get some javascript that will update them
+ $(document).on('ready count-change', function() {
+ var tabCountsUrl = $('ul.nav-tabs').data('tab-counts-url');
+ if( tabCountsUrl && tabCountsUrl.length ) {
+ $.get( tabCountsUrl );
+ }
+ });
diff --cc apps/workbench/app/models/job.rb
index 309cade,9e9c096..1528bd7
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@@ -34,24 -38,7 +38,27 @@@ class Job < ArvadosBas
arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
end
- def state
- Job::state(self)
- end
-
+ def self.state job
++ if job.responds_to? :state
++ return job.state
++ end
++
+ if not job[:cancelled_at].nil?
+ "Canceled"
+ elsif not job[:finished_at].nil? or not job[:success].nil?
+ if job[:success]
+ "Completed"
+ else
+ "Failed"
+ end
+ elsif job[:running]
+ "Running"
+ else
+ "Queued"
+ end
+ end
+
+ def textile_attributes
+ [ 'description' ]
+ end
end
diff --cc apps/workbench/app/views/application/_content.html.erb
index 7249e32,8ec92bf..65a518f
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@@ -1,41 -1,40 +1,42 @@@
<% content_for :tab_panes do %>
- <% comparable = controller.respond_to? :compare %>
+ <% comparable = controller.respond_to? :compare %>
- <ul class="nav nav-tabs">
- <ul class="nav nav-tabs" data-tab-counts-url="<%= url_for(action: :tab_counts) rescue '' %>">
- <% pane_list.each_with_index do |pane, i| %>
++<ul class="nav nav-tabs" data-tab-counts-url="<%= url_for(action: :tab_counts) rescue '' %>">
+ <% pane_list.each_with_index do |pane, i| %>
++ <% pane_name = (pane.is_a?(Hash) ? pane[:name] : pane) %>
+ <li class="<%= 'active' if i==0 %>">
- <a href="#<%= pane %>" data-toggle="tab"
++ <a href="#<%= pane_name %>" data-toggle="tab"
+ class="pane-anchor"
+ id="<%= pane %>-tab"
+ data-pane-content-url="<%= url_for(params.merge(tab_pane: pane)) %>">
- <%= pane.gsub('_', ' ') %>
++ <%= pane_name.gsub('_', ' ') %> <span id="<%= pane_name %>-count"></span>
+ </a>
+ </li>
+ <% end %>
+</ul>
+<div class="tab-content">
+<% pane_list.each_with_index do |pane, i| %>
- <div id="<%= pane %>"
+ <% pane_name = (pane.is_a?(Hash) ? pane[:name] : pane) %>
- <li class="<%= 'active' if i==0 %>">
- <a href="#<%= pane_name %>" data-toggle="tab" id="<%= pane_name %>-tab" data-pane-content-url="<%= url_for(params.merge(tab_pane: pane_name)) %>">
- <%= pane_name.gsub('_', ' ') %> <span id="<%= pane_name %>-count"></span>
- </a>
- </li>
- <% end %>
- </ul>
-
- <div class="tab-content">
- <% pane_list.each_with_index do |pane, i| %>
- <% pane_name = (pane.is_a?(Hash) ? pane[:name] : pane) %>
- <div id="<%= pane_name %>"
- class="tab-pane fade <%= 'in active loaded' if i==0 %> arv-log-event-listener"
- <% if controller.action_name == "index" %>
- data-object-kind="arvados#<%= ArvadosApiClient.class_kind controller.model_class %>"
- <% else %>
- data-object-uuid="<%= @object.uuid %>"
- <% end %>
- >
++ <div id="<%= pane_name %>"
+ class="tab-pane fade <%= 'in active loaded' if i==0 %> arv-log-event-listener"
+<% if controller.action_name == "index" %>
+ data-object-kind="arvados#<%= ArvadosApiClient.class_kind controller.model_class %>"
+<% else %>
+ data-object-uuid="<%= @object.uuid %>"
+<% end %>
+ >
-
- <div id="<%= pane %>-scroll" style="margin-top:0.5em;">
- <div class="pane-content">
- <% if i == 0 %>
- <%= render_pane pane, to_string: true %>
- <% else %>
- <div class="spinner spinner-32px spinner-h-center"></div>
- <% end %>
+ <div id="<%= pane_name %>-scroll" style="margin-top:0.5em;">
+ <div class="pane-content">
+ <% if i == 0 %>
+ <%= render_pane pane_name, to_string: true %>
+ <% else %>
+ <div class="spinner spinner-32px spinner-h-center"></div>
+ <% end %>
+ </div>
+ </div>
</div>
- </div>
+ <% end %>
</div>
- <% end %>
- </div>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list