app/models/ddr/batch/batch_object_attribute.rb in ddr-batch-1.7.2 vs app/models/ddr/batch/batch_object_attribute.rb in ddr-batch-2.0.0.alpha.1

@@ -44,14 +44,19 @@
     def datastream_type
       batch_object.model.constantize.ds_specs[datastream][:type] rescue nil
     end
 
     def datastream_valid?
-        datastream_type < ActiveFedora::RDFDatastream rescue false
+        [ 'adminMetadata', 'descMetadata' ].include?(datastream)
     end
 
     def attribute_name_valid?
-      datastream_type.term_names.include?(name.to_sym)
+      case datastream
+        when 'adminMetadata'
+          batch_object.model.constantize.properties.include?(name)
+        when 'descMetadata'
+          Ddr::Models::DescriptiveMetadata.unqualified_names.include?(name.to_sym)
+      end
     end
 
   end
 end