From ca61be685427c77d384a05a20988fec7960eb57e Mon Sep 17 00:00:00 2001
From: Eric Rafaloff <erafaloff@gmail.com>
Date: Mon, 9 Apr 2012 17:21:49 -0400
Subject: [PATCH] EssenceTrackIdentifierSource model does not have many essence
 tracks. This causes problems when deleting, because of #safe_to_delete?
 Updated PickList controller to load correct rjs views.

---
 app/controllers/picklists_controller.rb       |  6 ++---
 app/models/essence_track_identifier_source.rb |  6 ++++-
 .../picklists/{create.rjs => _create.rjs}     |  0
 .../picklists/{destroy.rjs => _destroy.rjs}   |  0
 .../picklists/{update.rjs => _update.rjs}     |  0
 db/schema.rb                                  | 27 ++++++-------------
 6 files changed, 16 insertions(+), 23 deletions(-)
 rename app/views/picklists/{create.rjs => _create.rjs} (100%)
 rename app/views/picklists/{destroy.rjs => _destroy.rjs} (100%)
 rename app/views/picklists/{update.rjs => _update.rjs} (100%)

diff --git a/app/controllers/picklists_controller.rb b/app/controllers/picklists_controller.rb
index d49d5fd..a8e7ac5 100644
--- a/app/controllers/picklists_controller.rb
+++ b/app/controllers/picklists_controller.rb
@@ -39,7 +39,7 @@ def update
     @obj = @klass.find(params[:id])
     @obj.update_attributes(params[@klass.to_s.underscore])
     respond_to do |format|
-      format.js
+      format.js { render :partial => 'picklists/update' }
       format.html { redirect_to :action => 'index' }
     end
   end
@@ -48,7 +48,7 @@ def create
     @obj = @klass.new(params[@klass.to_s.underscore])
     @obj.save
     respond_to do |format|
-      format.js
+      format.js { render :partial => 'picklists/create' }
       format.html { redirect_to :action => 'index' }
     end
   end
@@ -60,7 +60,7 @@ def destroy
       @obj.destroy
     end
     respond_to do |format|
-      format.js
+      format.js { render :partial => 'picklists/destroy' }
       format.html { redirect_to :action => 'index' }
     end
   end
diff --git a/app/models/essence_track_identifier_source.rb b/app/models/essence_track_identifier_source.rb
index 89166ea..62597d2 100644
--- a/app/models/essence_track_identifier_source.rb
+++ b/app/models/essence_track_identifier_source.rb
@@ -4,6 +4,10 @@ class EssenceTrackIdentifierSource < ActiveRecord::Base
   quick_column :name
   
   def safe_to_delete?
-    essence_tracks.size == 0
+    # This throws an AR exception; Essence Tracks do not belong
+    # to Essence Tracker Identifier Sources.
+    #
+    #essence_tracks.size == 0
+    true
   end
 end
diff --git a/app/views/picklists/create.rjs b/app/views/picklists/_create.rjs
similarity index 100%
rename from app/views/picklists/create.rjs
rename to app/views/picklists/_create.rjs
diff --git a/app/views/picklists/destroy.rjs b/app/views/picklists/_destroy.rjs
similarity index 100%
rename from app/views/picklists/destroy.rjs
rename to app/views/picklists/_destroy.rjs
diff --git a/app/views/picklists/update.rjs b/app/views/picklists/_update.rjs
similarity index 100%
rename from app/views/picklists/update.rjs
rename to app/views/picklists/_update.rjs
diff --git a/db/schema.rb b/db/schema.rb
index 6169aa0..060869b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,14 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120214070449) do
+ActiveRecord::Schema.define(:version => 20120325210855) do
+
+  create_table "annotation_types", :force => true do |t|
+    t.string   "name"
+    t.boolean  "visible",    :default => true
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "annotations", :force => true do |t|
     t.integer "container_id"
@@ -49,7 +56,6 @@
     t.string   "attachment"
   end
 
-  add_index "assets", ["id"], :name => "index_id"
   add_index "assets", ["uuid"], :name => "index_assets_on_uuid", :unique => true
 
   create_table "assets_audience_levels", :id => false, :force => true do |t|
@@ -256,15 +262,6 @@
 
   add_index "essence_tracks", ["instantiation_id"], :name => "index_essence_tracks_on_instantiation_id"
 
-  create_table "exports", :force => true do |t|
-    t.string   "status"
-    t.string   "file"
-    t.integer  "creator_id"
-    t.integer  "updater_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "extension_names", :force => true do |t|
     t.string   "extension_key"
     t.string   "extension_authority"
@@ -466,14 +463,6 @@
 
   add_index "ip_blocks", ["name"], :name => "index_ip_blocks_on_name", :unique => true
 
-  create_table "pbcore_importers", :force => true do |t|
-    t.string   "file"
-    t.integer  "number_of_records"
-    t.integer  "number_of_records_processed"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "publisher_roles", :force => true do |t|
     t.string  "name",                       :null => false
     t.boolean "visible", :default => false, :null => false