Merge pull request #270 from nhart/6.x

6.x

ContentModel.inc

@@ -1065,7 +1065,7 @@ class ContentModel extends XMLDatastream {
         if (strtolower($ingest_form->getAttribute('hide_file_chooser')) == 'TRUE') {
           $form['indicator']['ingest-file-location']['#type'] = 'hidden';
         }
-      }
+
         $dsid = $ingest_form->getAttribute('dsid');
 
         $method = $ingest_form->getElementsByTagName('form_builder_method')->item(0);
@@ -1093,6 +1093,10 @@ class ContentModel extends XMLDatastream {
           }
         }
       }
+      else {
+        self::$errors[] = 'No XML form association exists.';
+      }
+    }
     return $ret;
   }
 

formClass.inc

@@ -588,6 +588,7 @@ class formClass {
           drupal_set_message($error, 'error');
         }
       }
+      else {
         $form['collection_pid'] = array(
           '#type' => 'hidden',
           '#value' => $collection_pid
@@ -598,6 +599,7 @@ class formClass {
           '#value' => t('Ingest')
         );
       }
+    }
     return $form;
   }