access_controls_enforcement.rb in hydra-access-controls-5.0.0.pre12

- old
+ new

@@ -1,10 +1,11 @@
 # will move to lib/hydra/access_control folder/namespace in release 5.x
 module Hydra::AccessControlsEnforcement
+  extend ActiveSupport::Concern
   
-  def self.included(klass)
-    klass.send(:include, Hydra::AccessControlsEvaluation)
+  included do
+    include Hydra::AccessControlsEvaluation
   end
   
   #
   #   Access Controls Enforcement Filters
   #
@@ -51,11 +52,16 @@
   # Modeled on Blacklight::SolrHelper.get_permissions_solr_response_for_doc_id
   # @param [String] id of the documetn to retrieve
   # @param [Hash] extra_controller_params (optional)
   def get_permissions_solr_response_for_doc_id(id=nil, extra_controller_params={})
     raise Blacklight::Exceptions::InvalidSolrID.new("The application is trying to retrieve permissions without specifying an asset id") if id.nil?
-    solr_response = Blacklight.solr.find permissions_solr_doc_params(id).merge(extra_controller_params)
+    #solr_response = Blacklight.solr.get permissions_solr_doc_params(id).merge(extra_controller_params)
+    #path = blacklight_config.solr_path
+    solr_opts = permissions_solr_doc_params(id).merge(extra_controller_params)
+    response = Blacklight.solr.get('select', :params=> solr_opts)
+    solr_response = Blacklight::SolrResponse.new(force_to_utf8(response), solr_opts)
+
     raise Blacklight::Exceptions::InvalidSolrID.new("The solr permissions search handler didn't return anything for id \"#{id}\"") if solr_response.docs.empty?
     document = SolrDocument.new(solr_response.docs.first, solr_response)
     [solr_response, document]
   end
   
@@ -136,10 +142,10 @@
   def enforce_update_permissions(opts={})
     enforce_edit_permissions(opts)
   end
 
   ## proxies to enforce_edit_permssions.  This method is here for you to override
-  def enforce_delete_permissions(opts={})
+  def enforce_destroy_permissions(opts={})
     enforce_edit_permissions(opts)
   end
 
   ## proxies to enforce_edit_permssions.  This method is here for you to override
   def enforce_new_permissions(opts={})