Merge pull request #883 from avalonmediasystem/revert-879-playlist-bo…

…okmark-action

Revert "Add document action for adding to playlist"

app/controllers/bookmarks_controller.rb

@@ -35,8 +35,6 @@ class BookmarksController < CatalogController
 
   self.add_show_tools_partial( :delete, callback: :delete_action, if: Proc.new { |context, config, options| context.controller.user_can? :delete } )
 
-  self.add_show_tools_partial( :add_to_playlist, callback: :add_to_playlist_action )
-
   before_filter :verify_permissions, only: :index
 
   #HACK next two methods are a hack for problems in the puppet VM tomcat/solr
@@ -62,7 +60,7 @@ def user_can? action
 
   def verify_permissions
     @response, @documents = action_documents
-    @valid_user_actions = [:delete, :unpublish, :publish, :move, :update_access_control, :add_to_playlist]
+    @valid_user_actions = [:delete, :unpublish, :publish, :move, :update_access_control]
     mos = @documents.collect { |doc| MediaObject.find( doc.id ) }
     @documents.each do |doc|
       mo = MediaObject.find(doc.id)
@@ -117,17 +115,6 @@ def access_control_action documents
     MediaObject.access_control_bulk success_ids, params
   end
 
-  def add_to_playlist_action documents
-    playlist = Playlist.find(params[:target_playlist_id])
-    Array(documents.map(&:id)).each do |id|
-      media_object = MediaObject.find(id)
-      media_object.parts.each do |mf|
-        annotation = AvalonAnnotation.create(master_file: mf)
-        PlaylistItem.create(annotation: annotation, playlist: playlist)
-      end
-    end
-  end
-
   def status_action documents
     errors = []
     success_ids = []

config/locales/blacklight.en.yml

@@ -88,14 +88,6 @@ en:
         other: "These items were not moved:"
       }     	     
       error: "You do not have permission to add to collection %{collection_name}."
-    add_to_playlist:
-      form:
-        title: "Add to Playlist"
-      no_playlists: "You have no playlists"
-      confirm: "Please choose a playlist:"
-      button: "Add"
-      success: "Items successfully added to playlist."
-      fail: "Add to playlist failed."
     status:
       success: {
         one: "One item is being %{status}ed.",

config/routes.rb

@@ -11,8 +11,6 @@
       post '/bookmarks/update_access_control'
       post '/bookmarks/publish', as: :publish_bookmarks
       post '/bookmarks/unpublish', as: :unpublish_bookmarks
-      get '/bookmarks/add_to_playlist', as: :add_to_playlist_bookmarks
-      post '/bookmarks/add_to_playlist'
 
   post '/media_objects/set_session_quality'
 

spec/controllers/bookmarks_controller_spec.rb

@@ -25,7 +25,7 @@
     Delayed::Worker.delay_jobs = false
     login_user collection.managers.first
     3.times do
-      media_objects << mo = FactoryGirl.create(:media_object_with_master_file, collection: collection)
+      media_objects << mo = FactoryGirl.create(:media_object, collection: collection)
       post :create, id: mo.id
     end
   end
@@ -115,15 +115,6 @@
     end
   end
 
-  describe '#add_to_playlist' do
-    let!(:playlist) { FactoryGirl.create(:playlist) }
-    it 'added selected items to given playlist' do
-      expect { 
-        post 'add_to_playlist', target_playlist_id: playlist.id 
-      }.to change{PlaylistItem.where(playlist_id: playlist.id).count}.by(3)
-    end
-  end
-
   describe '#update_access_control' do
     it 'changes to hidden' do
       post 'update_access_control', hidden: "true"