Update the query

Update query for testing

Update query for testing

Revert the change for qa deploy

Update query

Update query and revert qa deploy

Update query to fix failed test

Update query to fix failed test

Update solr query

Remove comments

Update qa deploy config

Fix collection view error

Fix error

Fix error

Fix error

Fix error

Revert qa deploy config change

Remove un-used code

Author: VivianChu

app/controllers/dams_resource_controller.rb

@@ -40,9 +40,10 @@ def show
     # generate facet collection list for collection page only
     models = @document["active_fedora_model_ssi"]
     if models.include?("DamsAssembledCollection") || models.include?("DamsProvenanceCollection") || models.include?("DamsProvenanceCollectionPart") 
-      other_rights_query = "(otherRights_tesim:localDisplay OR otherRights_tesim:metadataDisplay) AND collections_tesim:#{params[:id]}"
-      @res, @doc = get_search_results(q: other_rights_query, rows: 1)
-      @metadata_only = !@res.response['numFound'].zero?
+        other_rights_fquery = "(otherRights_tesim:localDisplay OR otherRights_tesim:metadataDisplay)"
+        collection_solr_params = { :q => "collections_tesim:#{params[:id]}", :fq => other_rights_fquery, :rows => 1 }
+        collection_response, collection_documents = get_search_results(collection_solr_params, :spellcheck => "false")
+        @metadata_only = !collection_response.response['numFound'].zero?
 
         facet_collection_params = { :f=>{"collection_sim"=>"#{@document['title_tesim'].first.to_s}"}, :id=>params[:id], :rows => 0 }
         apply_gated_discovery( facet_collection_params, nil )
@@ -73,8 +74,7 @@ def show
     end
 
     # enforce access controls
-    if can? :show, @document
-
+    if can?(:show, @document) || @document['discover_access_group_ssim'].include?("public")
       # find related resources
       collectionData = @document["collection_json_tesim"]
 	  @collectionDocArray = Array.new
@@ -106,7 +106,7 @@ def show
       end
     elsif @document['discover_access_group_ssim'].include?("public")
       respond_to do |format|
-        format.html { render :metadata }
+        format.html
         format.json { render json: @document }
         format.rdf { render xml: @rdfxml }
         format.nt { rdf_nt }

spec/features/dams_collections_spec.rb

@@ -353,7 +353,7 @@
     @copyright = DamsCopyright.create status: 'Under copyright'
     @metadataOnlyObj = DamsObject.create titleValue: 'Test Object with metadataOnly Display', provenanceCollectionURI: @metadataOnlyCollection.pid, copyrightURI: @copyright.pid, otherRightsURI: @metadataDisplay.pid
     @localObj = DamsObject.create titleValue: 'Test Object with localDisplay', provenanceCollectionURI: @localOnlyCollection.pid, copyrightURI: @copyright.pid, otherRightsURI: @localDisplay.pid
-    @obj = DamsObject.create titleValue: 'Test Object with no localDisplay, no metadataOnlyDisplay', provenanceCollectionURI: @localOnlyCollection.pid, copyrightURI: @copyright.pid
+    @obj = DamsObject.create titleValue: 'Test Object with no localDisplay, no metadataOnlyDisplay', provenanceCollectionURI: @collection.pid, copyrightURI: @copyright.pid
     solr_index @localDisplay.pid
     solr_index @metadataDisplay.pid
     solr_index @metadataOnlyCollection.pid