[ARVADOS] updated: cff73e6feea770c80d9a63168de2be7cb6663a4d

Sun Jun 1 00:27:31 EDT 2014

Summary of changes:
 apps/workbench/app/views/collections/show.html.erb               | 4 +---
 apps/workbench/app/views/collections/show_file_links.html.erb    | 2 +-
 .../db/migrate/20140601022548_remove_name_from_collections.rb    | 9 +++++++++
 services/api/db/schema.rb                                        | 3 +--
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 services/api/db/migrate/20140601022548_remove_name_from_collections.rb

       via  cff73e6feea770c80d9a63168de2be7cb6663a4d (commit)
      from  135f306e75cb61e1153b3590b71c32ef497404ed (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 cff73e6feea770c80d9a63168de2be7cb6663a4d
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Jun 1 00:13:33 2014 -0400

    2872: Remove name column from collections table.

diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index 04c36d4..440d2ff 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -3,9 +3,7 @@
     <div class="panel panel-info">
       <div class="panel-heading">
 	<h3 class="panel-title">
-          <% default_name = "Collection #{@object.uuid}" %>
-	  <% name_html = render_editable_attribute @object, 'name', nil, {data: {emptytext: default_name}} %>
-          <%= (/\S/.match(name_html)) ? name_html : default_name %>
+          <% "Collection #{@object.uuid}" %>
 	</h3>
       </div>
       <div class="panel-body">
diff --git a/apps/workbench/app/views/collections/show_file_links.html.erb b/apps/workbench/app/views/collections/show_file_links.html.erb
index de012c7..78d75b1 100644
--- a/apps/workbench/app/views/collections/show_file_links.html.erb
+++ b/apps/workbench/app/views/collections/show_file_links.html.erb
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<% coll_name = (@object.name =~ /\S/) ? @object.name : "Collection #{@object.uuid}" %>
+<% coll_name = "Collection #{@object.uuid}" %>
 <% link_opts = {controller: 'collections', action: 'show_file',
                 uuid: @object.uuid, reader_token: params[:reader_token]} %>
 <head>
diff --git a/services/api/db/migrate/20140601022548_remove_name_from_collections.rb b/services/api/db/migrate/20140601022548_remove_name_from_collections.rb
new file mode 100644
index 0000000..4910de1
--- /dev/null
+++ b/services/api/db/migrate/20140601022548_remove_name_from_collections.rb
@@ -0,0 +1,9 @@
+class RemoveNameFromCollections < ActiveRecord::Migration
+  def up
+    remove_column :collections, :name
+  end
+
+  def down
+    add_column :collections, :name, :string
+  end
+end
diff --git a/services/api/db/schema.rb b/services/api/db/schema.rb
index 26f1bdc..8a61425 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 => 20140527152921) do
+ActiveRecord::Schema.define(:version => 20140601022548) do
 
 
 
@@ -77,7 +77,6 @@ ActiveRecord::Schema.define(:version => 20140527152921) do
     t.string   "modified_by_user_uuid"
     t.datetime "modified_at"
     t.string   "portable_data_hash"
-    t.string   "name"
     t.integer  "redundancy"
     t.string   "redundancy_confirmed_by_client_uuid"
     t.datetime "redundancy_confirmed_at"

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


hooks/post-receive
-- 


