[ARVADOS] created: fe84c84827af6092784408629e4cde0663fe6af8

[git at public.curoverse.com]

        at  fe84c84827af6092784408629e4cde0663fe6af8 (commit)


commit fe84c84827af6092784408629e4cde0663fe6af8
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue May 27 11:43:07 2014 -0400

    2754: Add pipeline template description attribute.

diff --git a/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb b/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
index 9b637d5..f18f515 100644
--- a/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
@@ -15,7 +15,7 @@
       </th><th>
         name
       </th><th>
-        components
+        description/components
       </th><th>
         owner
       </th>
@@ -39,7 +39,13 @@
       </td><td>
         <%= render_editable_attribute ob, 'name' %>
       </td><td>
-        <%= ob.components.collect { |k,v| k.to_s }.join(", ") %>
+        <% if ob.respond_to?(:description) and ob.description %>
+          <%= ob.description %>
+          <br />
+        <% end %>
+        <% ob.components.collect { |k,v| k.to_s }.each do |k| %>
+          <span class="label label-default"><%= k %></span>
+        <% end %>
       </td><td>
         <%= link_to_if_arvados_object ob.owner_uuid, friendly_name: true %>
       </td>
diff --git a/services/api/app/models/pipeline_template.rb b/services/api/app/models/pipeline_template.rb
index cd0e5cb..b016ce1 100644
--- a/services/api/app/models/pipeline_template.rb
+++ b/services/api/app/models/pipeline_template.rb
@@ -7,5 +7,6 @@ class PipelineTemplate < ArvadosModel
   api_accessible :user, extend: :common do |t|
     t.add :name
     t.add :components
+    t.add :description
   end
 end
diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index 22a0194..26f1bdc 100644
--- a/services/api/db/schema.rb
+++ b/services/api/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140519205916) do
+ActiveRecord::Schema.define(:version => 20140527152921) do
 
 
 
@@ -350,6 +350,7 @@ ActiveRecord::Schema.define(:version => 20140519205916) do
     t.string   "name"
     t.text     "components"
     t.datetime "updated_at",              :null => false
+    t.text     "description"
   end
 
   add_index "pipeline_templates", ["created_at"], :name => "index_pipeline_templates_on_created_at"

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


hooks/post-receive
--