garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

allow email updates from admin panel

Browse Source
This commit is contained in:
Athou
2013-05-22 11:41:24 +02:00
parent 6b74733817
commit 20c6e594a6
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -68,6 +68,7 @@ public class AdminREST extends AbstractResourceREST {
user.setPassword(encryptionService.getEncryptedPassword( user.setPassword(encryptionService.getEncryptedPassword(
userModel.getPassword(), user.getSalt())); userModel.getPassword(), user.getSalt()));
} }
user.setEmail(userModel.getEmail());
user.setDisabled(!userModel.isEnabled()); user.setDisabled(!userModel.isEnabled());
userDAO.update(user); userDAO.update(user);

7
src/main/webapp/templates/admin.useredit.html
View File

@@ -24,6 +24,13 @@
<span class="help-block">Leave blank if you don't want to change the password.</span> <span class="help-block">Leave blank if you don't want to change the password.</span>
</div> </div>
</div> </div>
<div class="control-group">
<label class="control-label" for="email">Email</label>
<div class="controls">
<input type="text" id="email" name="email" ng-model="user.email"
required />
</div>
</div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="admin">Admin</label> <label class="control-label" for="admin">Admin</label>
<div class="controls"> <div class="controls">