SAK-19498 merge trunk r85933

git-svn-id: https://source.sakaiproject.org/svn/user/branches/sakai-2.8.x@86337 66ffb92e-73f9-0310-93c1-f5514f145a0a
ox-it · Dec 13, 2010 · 79df950 · 79df950
1 parent c017f38
commit 79df950
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/user-tool/tool/src/java/org/sakaiproject/user/tool/UsersAction.java b/user-tool/tool/src/java/org/sakaiproject/user/tool/UsersAction.java
@@ -483,6 +483,13 @@ private String buildViewContext(SessionState state, Context context)
 			catch (UserLockedException e)
 			{
 			}
+
+			//SAK-19498
+			//check if user can change pw (this is used to determine if user should
+			//view createdBy and modifiedBy info (assuming you can't change pw for provided users)
+			if(UserDirectoryService.getInstance().allowUpdateUserPassword(id)){
+				context.put("viewCreatedModifiedBy", "true");
+			}
 
 			// disable auto-updates while not in list mode
 			disableObservers(state);

diff --git a/user-tool/tool/src/webapp/vm/user/chef_users_edit.vm b/user-tool/tool/src/webapp/vm/user/chef_users_edit.vm
@@ -100,7 +100,7 @@
 			#end
 			</p>	
 #end
-#if ($user)
+#if ($user && $service.allowUpdateUserPassword($user.Id))
 			<p class="shorttext">
 				<label>$tlang.getString("useedi.creby")</label>
 				$validator.escapeHtml($user.CreatedBy.DisplayName)

diff --git a/user-tool/tool/src/webapp/vm/user/chef_users_view.vm b/user-tool/tool/src/webapp/vm/user/chef_users_view.vm
@@ -61,7 +61,7 @@
 						</td>
 					</tr>
 				</table>
-
+#if($viewCreatedModifiedBy)
 			<table class="itemSummary" summary="$tlang.getString("usevie.revuseinf")">
 				<tr>
 					<th>$tlang.getString("useedi.creby")</th>
@@ -88,6 +88,7 @@
 					</td>
 				</tr>
 			</table>
+#end
 			<input type="hidden" id="id" name="id" value="$validator.escapeHtml($user.Id)" />
 #if($enableEdit)
 			<div class="act">