From 6eac5a30c4e04fb54b58cf473efaa65bd65743a4 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 8 Apr 2010 18:42:20 +0000
Subject: [PATCH] Undoing last revision

---
 webapp/config/web.xml                         |  8 +++-
 .../web/templates/edit/specific/user_edit.jsp | 45 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 95ad7c0e4..e5f2f3aca 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -115,7 +115,13 @@
 		<listener-class>
 	        edu.cornell.mannlib.vitro.webapp.auth.policy.setup.SelfEditingPolicySetup
 		</listener-class>
-	</listener>    
+	</listener>
+    
+    <listener>
+        <listener-class>
+            edu.cornell.mannlib.vitro.webapp.auth.identifier.UserToIndIdentifierFactorySetup
+        </listener-class>
+    </listener>
 
   <listener>
     <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.EditorEditingPolicySetup
diff --git a/webapp/web/templates/edit/specific/user_edit.jsp b/webapp/web/templates/edit/specific/user_edit.jsp
index 55821c8da..5e1b4f279 100644
--- a/webapp/web/templates/edit/specific/user_edit.jsp
+++ b/webapp/web/templates/edit/specific/user_edit.jsp
@@ -45,6 +45,51 @@
 </tr>
 </table>
 
+<c:if test="true"> <!-- test="${requestScope.user.roleURI == 1 }">  -->
+
+<h3 class="associate">Associate user account with a person</h3>
+<table class="form-background" border="0" cellpadding="2" cellspacing="2">  
+  <c:if test="${requestScope.mayEditAsStmts != null }">          
+    <c:forEach items="${requestScope.mayEditAsStmts }" var="stmt">
+      <c:url var="deleteUrl" value="/edit/editRequestDispatch.jsp">
+        <c:param name="subjectUri">${user.URI}</c:param>
+        <c:param name="predicateUri">${stmt.propertyURI}</c:param>
+        <c:param name="objectUri">${stmt.objectURI}</c:param>
+        <c:param name="editform">admin/mayEditAs.jsp</c:param>                
+      </c:url>
+      <tr>
+        <td>
+        	<c:if test="${stmt.object == null or empty stmt.object.name }">
+        		<c:set var="associatedIndividual" value="${stmt.objectURI}" />
+        	</c:if>
+        	<c:if test="${stmt.object != null and !empty stmt.object.name }">
+        	  <c:set var="associatedIndividual" value="${stmt.object.name}" />
+        	</c:if>            
+          ${associatedIndividual} -- <a href="${deleteUrl}">Change or Remove Association</a>
+        </td>            
+      </tr>
+    </c:forEach> 
+    <tr><td><em class="note">Note: <c:if test="${requestScope.user.roleURI == 1 }">This association allows the user to edit this person and be redirected to the person's profile when logging in.</c:if><c:if test="${requestScope.user.roleURI != 1 }">This association will result in the user being redirected to the person's profile when logging in.</c:if></em></td></tr>             
+  </c:if>
+  
+  <c:if test="${requestScope.mayEditAsStmts == null  }">
+    <tr>
+      <td>
+        <c:url var="addUrl" value="/edit/editRequestDispatch.jsp">
+        <c:param name="subjectUri">${user.URI}</c:param>
+        <c:param name="editform">admin/mayEditAs.jsp</c:param>
+        </c:url>
+        This user account is not associated with a person -- <a href="${addUrl}">Select a person</a>
+      </td>
+    </tr>
+    <tr>
+      <td><em class="note">Note: <c:if test="${requestScope.user.roleURI == 1 }">Until an association is made, the self editor has no permissions to edit. Associating this user account to a person allows the user to edit this person and be redirected to the person's profile when logging in.</c:if><c:if test="${requestScope.user.roleURI != 1 }">Associating this user account to a person will result in the user being redirected to the person's profile when logging in.</c:if></em></td>
+    </tr>  
+  </c:if>
+    
+</table>
+
+</c:if>
 </div>
 </div>
 </jsp:root>