Browse files

SAK-19498 merge r99463 from trunk

git-svn-id: https://source.sakaiproject.org/svn/user/branches/sakai-2.8.x@99464 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information...
1 parent cc91725 commit 19865574a4fccec94b1133250fa6b6532f07642b ottenhoff@longsight.com committed Oct 12, 2011
View
7 user-tool/tool/src/java/org/sakaiproject/user/tool/UsersAction.java
@@ -488,13 +488,6 @@ 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);
View
2 user-tool/tool/src/webapp/vm/user/chef_users_edit.vm
@@ -112,7 +112,7 @@
#end
</p>
#end
-#if ($user && $service.allowUpdateUserPassword($user.Id))
+#if ($user)
<p class="shorttext">
<label>$tlang.getString("useedi.creby")</label>
$validator.escapeHtml($user.CreatedBy.DisplayName)
View
6 user-tool/tool/src/webapp/vm/user/chef_users_view.vm
@@ -61,7 +61,7 @@
</td>
</tr>
</table>
-#if($viewCreatedModifiedBy)
+#if($enableEdit)
<table class="itemSummary" summary="$tlang.getString("usevie.revuseinf")">
<tr>
<th>$tlang.getString("useedi.creby")</th>
@@ -88,12 +88,10 @@
</td>
</tr>
</table>
-#end
- <input type="hidden" id="id" name="id" value="$validator.escapeHtml($user.Id)" />
-#if($enableEdit)
<div class="act">
<input type="submit" name="eventSubmit_doModify" value="$tlang.getString("usevie.mod2")" accesskey="s" />
</div>
#end
+ <input type="hidden" id="id" name="id" value="$validator.escapeHtml($user.Id)" />
</form>
</div>

0 comments on commit 1986557

Please sign in to comment.