From 138b1b4bd0f1e9aa9e6f976d9fca0ce46b79d2bd Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 5 Apr 2010 02:34:27 +0000
Subject: [PATCH] NIHVIVO-193, NIHVIVO-194 Comments

---
 productMods/edit/forms/js/customForm.js             | 7 ++++---
 productMods/edit/forms/personHasPositionHistory.jsp | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/productMods/edit/forms/js/customForm.js b/productMods/edit/forms/js/customForm.js
index 6750d0f9..3b54fe5a 100644
--- a/productMods/edit/forms/js/customForm.js
+++ b/productMods/edit/forms/js/customForm.js
@@ -33,7 +33,7 @@
  * We're jerry-rigging one-step forms into the two-step form process due to time constraints.
  * In a later iteration of the custom form Javascript, we'll create a customForm object
  * with subclasses for one-step and two-step forms. The parent object will contain
- * the utilities used by all form types. The two-step edit form will essentially be a one-step form.
+ * the utilities used by all form types. The two-step edit form will be a type of one-step form.
  * 
  * One-step custom form workflow:
  *             
@@ -167,8 +167,9 @@ var customForm = {
         });     
     },
     
-    // Set up form when returning directly to step 2, such as after validation errors
-    // on the form submission.
+    // Set up add form for step 2. If no view is passed in, we're returning
+    // from a failed submission due to validation errors, and will attempt to
+    // determine the previous view from the form data that's been entered.
     doAddFormStep2: function(view) {
 
     	if (!view) {
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index 686ecb48..9fb63089 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -335,6 +335,8 @@
     <input type="hidden" name="editType" value="${editType}" />
     <input type="hidden" name="entryType" value="position" /> 
     <input type="hidden" name="secondaryType" value="organization" />
+    <%-- RY If set steps to 1 when editType == 'edit', may be able to combine the
+    step 1 and edit cases in the Javascript.  --%>
     <input type="hidden" name="steps" value="2" />
        
     <p class="submit"><v:input type="submit" id="submit" value="${submitLabel}" cancel="${param.subjectUri}"/></p>