lib/hydra/batch_edit_behavior.rb in hydra-batch-edit-0.3.1 vs lib/hydra/batch_edit_behavior.rb in hydra-batch-edit-1.0.0

@@ -1,64 +1,31 @@
+require 'hydra/collections'
+
 module Hydra
   module BatchEditBehavior
     extend ActiveSupport::Concern
     
     included do
+      include Hydra::Collections::AcceptsBatches
+
       before_filter :filter_docs_with_access!, :only=>[:edit, :update, :destroy_collection]
       before_filter :check_for_empty!, :only=>[:edit, :update, :destroy_collection]
     end
 
-    
     # fetch the documents that match the ids in the folder
     def index
       @response, @documents = get_solr_response_for_field_values("id", batch)
     end
 
     def state
       session[:batch_edit_state] = params[:state]
       render :json => {"OK" => "OK"}
     end
 
-    # add a document_id to the batch. :id of action is solr doc id 
-    def add
-      id = params[:id]
-      raise "Too many items in batch!" if ((batch.to_s.length+id.to_s.length) > 2200) # we are going to overflow our cookie
-      batch << id if ! batch.include? id 
-      respond_to do |format|
-        format.html do
-          redirect_to :back, :notice =>  "#{params[:title] || "Item"} successfully added to batch"
-        end
-        format.js { render :json => batch }
-      end
-    end
-   
-    # remove a document_id from the batch. :id of action is solr_doc_id
-    def destroy
-      batch.delete(params[:id])
-      respond_to do |format|
-        format.html do
-          redirect_to :back, :notice => "#{params[:title] || "Item"} successfully removed from batch"
-        end
-        format.js do
-          render :json => {"OK" => "OK"}
-        end
-      end
-            
-    end
-   
-    # get rid of the items in the batch
-    def clear
-      clear_batch!
-      respond_to do |format|
-        format.html { redirect_to :back, :notice=> "Batch has been cleared" }
-        format.js { render :json => batch }
-      end
-    end
-
     def edit
     end
-
+    
     #pulled out to allow a user to override the default redirect
     def after_update
       redirect_to catalog_index_path
     end
 
@@ -73,11 +40,10 @@
         obj = ActiveFedora::Base.find(doc_id, :cast=>true)
         update_document(obj)
         obj.save
       end
       flash[:notice] = "Batch update complete"
-      clear_batch!
       after_update 
     end
 
     def all 
       self.batch = Hydra::BatchEdit::SearchService.new(session, current_user.user_key).last_search_documents.map(&:id)
@@ -96,51 +62,16 @@
         batch.each do |doc_id|
           obj = ActiveFedora::Base.find(doc_id, :cast=>true)
           obj.destroy
         end
         flash[:notice] = "Batch delete complete"
-        clear_batch! 
         after_destroy_collection    
     end 
-
-    def check_for_empty?
-      return batch.empty?
-    end
-
-    protected
-
-    def batch
-      session[:batch_document_ids] ||= []
-    end
-
-    def batch=(val)
-      session[:batch_document_ids] = val
-    end
-
-
-    def clear_batch!
-      self.batch = []
-    end
-
-    def check_for_empty!
-      if batch.empty?
-        redirect_to :back
-        return false
-      end
-    end
     
-    def filter_docs_with_access!
-      no_permissions = []
-      if batch.empty?
-        flash[:notice] = "Select something first"
-      else
-        batch.dup.each do |doc_id|
-          unless can?(:edit, doc_id)
-            session[:batch_document_ids].delete(doc_id)
-            no_permissions << doc_id
-          end
-        end
-        flash[:notice] = "You do not have permission to edit the documents: #{no_permissions.join(', ')}" unless no_permissions.empty?
+    def check_for_empty!
+       if check_for_empty_batch?
+         redirect_to :back
+         return false
       end
     end
     
   end
 end