From 87bdc3aa36eba8cda77f406066c2a1f8c17838d7 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 14 Jul 2010 18:09:29 +0000
Subject: [PATCH] NIHVIVO-799 Revert change that shows full view of two-step
 form when a type is selected on page load: doesn't work for roles forms
 because there's no empty value.

---
 productMods/edit/forms/addClinicalRoleToPerson.jsp  |  2 +-
 productMods/edit/forms/addMemberRoleToPerson.jsp    |  2 +-
 productMods/edit/forms/addPresenterRoleToPerson.jsp |  2 +-
 .../edit/forms/addResearcherRoleToPerson.jsp        |  2 +-
 productMods/edit/forms/addTeacherRoleToPerson.jsp   |  2 +-
 .../forms/js/customFormWithAdvanceTypeSelection.js  | 13 ++++++++-----
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp
index c73906c2..ea113f7c 100644
--- a/productMods/edit/forms/addClinicalRoleToPerson.jsp
+++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp
@@ -6,5 +6,5 @@
 	
 	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addMemberRoleToPerson.jsp b/productMods/edit/forms/addMemberRoleToPerson.jsp
index 442382e2..3c647498 100644
--- a/productMods/edit/forms/addMemberRoleToPerson.jsp
+++ b/productMods/edit/forms/addMemberRoleToPerson.jsp
@@ -6,5 +6,5 @@
 	
 	<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
 	<jsp:param name="roleActivityType_objectClassUri" value="http://xmlns.com/foaf/0.1/Organization" /> 
-	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
+	<jsp:param name="roleActivityType_literalOptions" value="[ '', 'Select one' ]" />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp
index d338e06d..849a12e3 100644
--- a/productMods/edit/forms/addPresenterRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp
@@ -7,5 +7,5 @@
 	
 	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp
index 33e2f708..6fe07c1c 100644
--- a/productMods/edit/forms/addResearcherRoleToPerson.jsp
+++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp
@@ -6,5 +6,5 @@
 	
 	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp
index 11e594f6..bc0a6fd4 100644
--- a/productMods/edit/forms/addTeacherRoleToPerson.jsp
+++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp
@@ -6,5 +6,5 @@
 	
 	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
index 4931428a..067a6338 100644
--- a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
+++ b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
@@ -78,11 +78,14 @@ var customForm = {
         // If type is already selected when the page loads (Firefox retains value
         // on a refresh), go directly to full view. Otherwise user has to reselect
         // twice to get to full view.
-        else if (typeVal.length) {
-            this.acType = typeVal;
-            this.setLabelFieldLabel();
-            this.initFormFullView();
-        }
+// RY Can't do this now: role forms don't have an empy option at the top (and can't at the
+// moment, since there's no way to specify literal options without having them sorted).
+// So when the page loads there's already a value selected.
+//        else if (typeVal.length) {
+//            this.acType = typeVal;
+//            this.setLabelFieldLabel();
+//            this.initFormFullView();
+//        }
         else {
             this.initFormTypeView();
         }