[ARVADOS] updated: bc7b64beb18c4b8900a9d14f9539b184ef37cb64

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/models/collection.rb            | 4 ++++
 apps/workbench/app/views/application/show.html.erb | 2 +-
 apps/workbench/app/views/collections/show.html.erb | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

       via  bc7b64beb18c4b8900a9d14f9539b184ef37cb64 (commit)
      from  ac79a0b185c3f9bf163c7685040e49c59825e17a (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 bc7b64beb18c4b8900a9d14f9539b184ef37cb64
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 16 11:22:02 2014 -0400

    2875: collection description is now textile and also the display is updated.

diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index edd87ad..40fd930 100644
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -110,4 +110,8 @@ class Collection < ArvadosBase
     end
   end
 
+  def textile_attributes
+    [ 'description' ]
+  end
+
 end
diff --git a/apps/workbench/app/views/application/show.html.erb b/apps/workbench/app/views/application/show.html.erb
index d4b1785..0697fef 100644
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -5,7 +5,7 @@
 <% end %>
 
 <% content_for :content_top do %>
-  <% if !['Group','User'].include? @object.class.to_s # not a project %>
+  <% if !['Group','User', 'Collection'].include? @object.class.to_s # projects and collections handle it themselves %>
     <%= render partial: 'name_and_description' %>
   <% end %>
 
diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index 94b099a..a80cf39 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -33,6 +33,9 @@
 	</h3>
       </div>
       <div class="panel-body">
+        <div class="arv-description-as-subtitle">
+          <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
+        </div>
         <img src="/favicon.ico" class="pull-right" alt="" style="opacity: 0.3"/>
         <% if defined? @same_pdh %>
           <p>Found in collections:<p>

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


hooks/post-receive
--