hyrax/app/indexers/complex_field/subject_indexer.rb

@@ -71,7 +71,7 @@ module ComplexField
     def self.subject_search_fields
       # solr fields that will be used for a search
       fields = []
-      fields << Solrizer.solr_name('complex_subject_identifier', :symbol)
+      fields << Solrizer.solr_name('complex_subject_id', :symbol)
       fields << Solrizer.solr_name('complex_subject_species', :stored_searchable)
       fields << Solrizer.solr_name('complex_subject_type', :stored_searchable)
       fields << Solrizer.solr_name('complex_subject_sex', :stored_searchable)

hyrax/app/models/crc_dataset.rb

@@ -111,7 +111,6 @@ class CrcDataset < ActiveFedora::Base
     index.as :stored_searchable
   end
 
-  # ------ properties from DublinCore metadata ------
   property :coverage, predicate: ::RDF::Vocab::DC.coverage, multiple: false do |index|
     index.as :stored_searchable, :facetable
   end
@@ -125,7 +124,7 @@ class CrcDataset < ActiveFedora::Base
   accepts_nested_attributes_for :complex_identifier, reject_if: :identifier_blank, allow_destroy: true
   accepts_nested_attributes_for :complex_funding_reference, reject_if: :fundref_blank, allow_destroy: true
   accepts_nested_attributes_for :complex_relation, reject_if: :relation_blank, allow_destroy: true
-  accepts_nested_attributes_for :complex_subject, reject_if: :all_blank, allow_destroy: true
+  accepts_nested_attributes_for :complex_subject, reject_if: :subject_blank, allow_destroy: true
 
   private
 

hyrax/app/models/solr_document.rb

@@ -26,10 +26,18 @@ class SolrDocument
 
   use_extension( Hydra::ContentNegotiation )
 
+  def approval_number
+    self[Solrizer.solr_name('approval_number', :symbol)]
+  end
+
   def complex_date
     self[Solrizer.solr_name('complex_date', :displayable)]
   end
 
+  def complex_funding_reference
+    self[Solrizer.solr_name('complex_funding_reference', :displayable)]
+  end
+
   def complex_identifier
     self[Solrizer.solr_name('complex_identifier', :displayable)]
   end
@@ -38,48 +46,48 @@ class SolrDocument
     self[Solrizer.solr_name('complex_person', :displayable)]
   end
 
-  def doi
-    self[Solrizer.solr_name('doi', :symbol)]
+  def complex_relation
+    self[Solrizer.solr_name('complex_relation', :displayable)]
   end
 
-  def parent_work_id
-    self[Solrizer.solr_name('parent_work_id', :symbol)]
+  def complex_subject
+    self[Solrizer.solr_name('complex_subject', :displayable)]
+  end
+
+  def coverage
+    self[Solrizer.solr_name('coverage', :stored_searchable)]
+  end
+
+  def crc_resource_type
+    self[Solrizer.solr_name('crc_resource_type', :stored_searchable)]
   end
 
   def crc_work_type
     self[Solrizer.solr_name('crc_work_type', :stored_searchable)]
   end
 
-  def experiment_title
-    self[Solrizer.solr_name('experiment_title', :stored_searchable)]
+  def doi
+    self[Solrizer.solr_name('doi', :symbol)]
+  end
+
+  def extra_information
+    self[Solrizer.solr_name('extra_information', :stored_searchable)]
   end
 
   def experiment_description
     self[Solrizer.solr_name('experiment_description', :stored_searchable)]
   end
 
-  def complex_relation
-    self[Solrizer.solr_name('complex_relation', :displayable)]
-  end
-  
-  def complex_funding_reference
-    self[Solrizer.solr_name('complex_funding_reference', :displayable)]
+  def experiment_title
+    self[Solrizer.solr_name('experiment_title', :stored_searchable)]
   end
 
   def modality
     self[Solrizer.solr_name('modality', :stored_searchable)]
   end
 
-  def complex_subject
-    self[Solrizer.solr_name('complex_subject', :displayable)]
-  end
-
-  def approval_number
-    self[Solrizer.solr_name('approval_number', :symbol)]
-  end
-
-  def extra_information
-    self[Solrizer.solr_name('extra_information', :stored_searchable)]
+  def parent_work_id
+    self[Solrizer.solr_name('parent_work_id', :symbol)]
   end
 
   def software_version

hyrax/app/presenters/hyrax/crc_dataset_presenter.rb

@@ -2,8 +2,8 @@
 #  `rails generate hyrax:work CrcDataset`
 module Hyrax
   class CrcDatasetPresenter < Hyrax::WorkShowPresenter
-    delegate :complex_date, :complex_identifier, :doi, :complex_person, :complex_funding_reference,
-             :complex_relation, :modality, :complex_subject, :approval_number, :extra_information,
-             :software_version, :parent_work_id, :crc_work_type, :experiment_title, :experiment_description, to: :solr_document
+    delegate :approval_number, :complex_date, :complex_funding_reference, :complex_identifier, :complex_person,
+             :complex_relation, :complex_subject, :coverage, :crc_resource_type, :crc_work_type, :doi, :experiment_title,
+             :experiment_description, :extra_information, :modality, :parent_work_id, :software_version, to: :solr_document
   end
 end

hyrax/config/initializers/hyrax.rb

@@ -110,7 +110,7 @@ Hyrax.config do |config|
   # Should work creation require file upload, or can a work be created first
   # and a file added at a later time?
   # The default is true.
-  # config.work_requires_files = true
+  config.work_requires_files = false
 
   # How many rows of items should appear on the work show view?
   # The default is 10