From 7ab20aaeec2896aefaeebcca3d23bed8965003fb Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 12 Jul 2011 14:23:34 +0000
Subject: [PATCH] NIHVIVO-2279 in add/edit forms, change field name from
 "degreeUri" to "newProfileClassUri".

---
 .../webapp/controller/accounts/admin/UserAccountsAddPage.java | 2 +-
 .../controller/accounts/admin/UserAccountsEditPage.java       | 2 +-
 webapp/web/js/account/accountAssociateProfile.js              | 2 +-
 .../body/accounts/userAccounts-associateProfilePanel.ftl      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
index abc579007..685154aea 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
@@ -32,7 +32,7 @@ public class UserAccountsAddPage extends UserAccountsPage {
 	private static final String PARAMETER_LAST_NAME = "lastName";
 	private static final String PARAMETER_ROLE = "role";
 	private static final String PARAMETER_ASSOCIATED_PROFILE_URI = "associatedProfileUri";
-	private static final String PARAMETER_NEW_PROFILE_CLASS_URI = "degreeUri";
+	private static final String PARAMETER_NEW_PROFILE_CLASS_URI = "newProfileClassUri";
 
 	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
 	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
index 829437c41..ae2459ded 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
@@ -37,7 +37,7 @@ public class UserAccountsEditPage extends UserAccountsPage {
 	private static final String PARAMETER_LAST_NAME = "lastName";
 	private static final String PARAMETER_ROLE = "role";
 	private static final String PARAMETER_ASSOCIATED_PROFILE_URI = "associatedProfileUri";
-	private static final String PARAMETER_NEW_PROFILE_CLASS_URI = "degreeUri";
+	private static final String PARAMETER_NEW_PROFILE_CLASS_URI = "newProfileClassUri";
 
 	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
 	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
diff --git a/webapp/web/js/account/accountAssociateProfile.js b/webapp/web/js/account/accountAssociateProfile.js
index 885fe6889..a5b9e671f 100644
--- a/webapp/web/js/account/accountAssociateProfile.js
+++ b/webapp/web/js/account/accountAssociateProfile.js
@@ -47,7 +47,7 @@ var associateProfileFields = {
         // We want to associate a profile
         this.associationOptionsArea = $('#associationOptions');
         this.associateProfileNameField = $('#associateProfileName');
-        this.newProfileClassSelector = $('#degreeUri');
+        this.newProfileClassSelector = $('#newProfileClassUri');
         
         // Container <div> elements to provide background shading -- tlw72
         this.associateProfileBackgroundOneArea = $('#associateProfileBackgroundOne');
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
index 3e0d0d6c3..52d6fb8b6 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
@@ -38,10 +38,10 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/auto
             <p> - or - </p>
             <p> 
                 <label for="">Create the associated profile</label> 
-                <select name="degreeUri" id="degreeUri" >
+                <select name="newProfileClassUri" id="newProfileClassUri" >
                     <option value="" selected="selected">Select one</option>
                     <#list profileTypes?keys as key>
-                        <option value="${key}" <#if degreeUri = key> selected </#if> >${profileTypes[key]}</option>           
+                        <option value="${key}" <#if newProfileClassUri = key> selected </#if> >${profileTypes[key]}</option>           
                     </#list>    
                 </select>    
             </p>