Merge pull request #352 from jcraitz/jcraitz-fix-workflow-start-on-ne…

…w-resources fixes workflow start for new resources created by ajax form or API
coral-erm · Jan 25, 2018 · 1c1031d · 1c1031d
2 parents bebe54d + a805616
commit 1c1031d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/resources/ajax_processing/submitNewResource.php b/resources/ajax_processing/submitNewResource.php
@@ -24,8 +24,6 @@
 
 		$resource->resourceTypeID 		= $_POST['resourceTypeID'];
 		$resource->resourceFormatID 	= $_POST['resourceFormatID'];
-		$resource->acquisitionTypeID 	= $_POST['acquisitionTypeID'];
-
 		$resource->titleText 			= $_POST['titleText'];
 		$resource->descriptionText 		= $_POST['descriptionText'];
 		$resource->isbnOrISSN	 		= [];
@@ -60,7 +58,8 @@
             // Create the default order
             $resourceAcquisition = new ResourceAcquisition();
             $resourceAcquisition->resourceID = $resourceID;
-            $resourceAcquisition->subscriptionStartDate = date("Y-m-d");
+			$resourceAcquisition->acquisitionTypeID = $_POST['acquisitionTypeID'];
+			$resourceAcquisition->subscriptionStartDate = date("Y-m-d");
             $resourceAcquisition->subscriptionEndDate = date("Y-m-d");
             $resourceAcquisition->save();
 
@@ -149,7 +148,7 @@
 
 			//next if the resource was submitted, enter into workflow
 			if ($statusID == $status->getIDFromName('progress')){
-				$resource->enterNewWorkflow();
+				$resourceAcquisition->enterNewWorkflow();
 			}
 
 

diff --git a/resources/api/index.php b/resources/api/index.php
@@ -209,7 +209,7 @@
         }
 
 
-      $resource->enterNewWorkflow();
+      $resourceAcquisition->enterNewWorkflow();
 
 
     } catch (Exception $e) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -209,7 +209,7 @@ @@
             }
-          $resource->enterNewWorkflow();
+          $resourceAcquisition->enterNewWorkflow();
         } catch (Exception $e) {
@@ Expand Down @@