[ARVADOS] updated: cd00c7d65d724ea78fe6e59dda333241a7c0775a

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/request_shell_access.js | 36 ++++++++++++++++++++++
 apps/workbench/app/controllers/users_controller.rb |  9 ++++++
 .../app/mailers/request_shell_access_reporter.rb   | 11 +++++++
 apps/workbench/app/models/collection.rb            |  8 ++++-
 .../send_request.text.erb                          |  7 +++++
 .../views/users/_manage_virtual_machines.html.erb  | 17 +++++++++-
 apps/workbench/config/application.default.yml      |  3 ++
 apps/workbench/config/routes.rb                    |  1 +
 .../test/controllers/users_controller_test.rb      | 21 +++++++++++++
 apps/workbench/test/diagnostics/pipeline_test.rb   |  1 +
 apps/workbench/test/integration/projects_test.rb   | 12 +++++++-
 .../test/integration/user_manage_account_test.rb   | 18 +++++++++++
 services/api/test/fixtures/collections.yml         |  1 +
 13 files changed, 142 insertions(+), 3 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/request_shell_access.js
 create mode 100644 apps/workbench/app/mailers/request_shell_access_reporter.rb
 create mode 100644 apps/workbench/app/views/request_shell_access_reporter/send_request.text.erb

       via  cd00c7d65d724ea78fe6e59dda333241a7c0775a (commit)
       via  26ac1b2f41916d1f4040073a15dfae5f1b294cb5 (commit)
       via  1de8e55b47ea46fe1e589fbfe1ff0ae77b9e2cbf (commit)
       via  f5a30607d1746b29688363530a3011ee5c2f4f9a (commit)
       via  4993b8b44022fd3dc73fcebf20f80d054bdf4370 (commit)
       via  f2e686e1c4e117c93d462ec94e315df9e0be02c6 (commit)
       via  f414dc4c1862c8d471b865dea5c7ac141de6d533 (commit)
       via  180498df4db8c43080bb302bc56edea70c940583 (commit)
       via  c6566ea328710818ab9b65db6187751f1874415c (commit)
       via  f7cc825b6a7a526a95e9f889ba94f4122f191889 (commit)
       via  a41baffe4f38019cb5b36875c5e0c838ef9201e5 (commit)
       via  c5fa3f7b2faea363cf73c7e4a2880086c7c9e4f0 (commit)
       via  826cb14afd19197738ceba11ff382aaaf123a637 (commit)
       via  dcba3e2c566b2cc3d0575f4b11a1deac808d5cd6 (commit)
       via  e1523c518fa4bf04ac4c982d0a5dbd681dea279a (commit)
       via  9fc99919d72ee495e66ce98584189c651cf994c1 (commit)
       via  cd3019ce332106ebf80b4323f0f24e71025adcb1 (commit)
       via  90af4cd87e9525481bd0bc8120a18ebc27c9a459 (commit)
       via  378c32cf74c1c9d559e3b8e559a9dcdc77ff2017 (commit)
      from  b80db28cdd536077e5effe6c08af079532c2059b (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 cd00c7d65d724ea78fe6e59dda333241a7c0775a
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Feb 11 17:32:37 2015 -0500

    5185: in project data collections tab, show description when available; otherwise display modified time.

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index 1bd711b..a8eebf3 100644
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -35,7 +35,13 @@ class Collection < ArvadosBase
   end
 
   def content_summary
-    ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
+    if total_bytes > 0
+      ApplicationController.helpers.human_readable_bytes_html(total_bytes) + " " + super
+    elsif description
+      description
+    else
+      super + " modified at " + modified_at.to_s
+    end
   end
 
   def total_bytes
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 73a23d6..1a8fa6e 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -712,6 +712,16 @@ class ProjectsTest < ActionDispatch::IntegrationTest
                           "/projects/#{project['uuid']}#Advanced"))
     assert_text("API response")
     find("#page-wrapper .nav-tabs :first-child a").click
-    assert_text("bytes Collection")
+    assert_text("Collection modified at")
+  end
+
+  test "verify description column in data collections tab" do
+    project = api_fixture('groups')['aproject']
+    visit(page_with_token('active_trustedclient', "/projects/#{project['uuid']}"))
+
+    collection = api_fixture('collections')['collection_to_move_around_in_aproject']
+    assert_text collection['name']
+    assert_text collection['description']
+    assert_text 'Collection modified at' # there are collections with no descriptions
   end
 end
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 9ddc452..d439137 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -197,6 +197,7 @@ collection_to_move_around_in_aproject:
   updated_at: 2014-02-03T17:22:54Z
   manifest_text: ". 73feffa4b7f6bb68e44cf984c85f6e88+3 0:3:baz\n"
   name: collection_to_move_around
+  description: description for the collection to move around
 
 expired_collection:
   uuid: zzzzz-4zz18-mto52zx1s7sn3ih

-----------------------------------------------------------------------


hooks/post-receive
--