From 20c6e594a6d04b6c761ea8bbe82909acb6d53b85 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 22 May 2013 11:41:24 +0200
Subject: [PATCH] allow email updates from admin panel

---
 .../com/commafeed/frontend/rest/resources/AdminREST.java   | 1 +
 src/main/webapp/templates/admin.useredit.html              | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
index 3ccad02f..07299670 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
@@ -68,6 +68,7 @@ public class AdminREST extends AbstractResourceREST {
 				user.setPassword(encryptionService.getEncryptedPassword(
 						userModel.getPassword(), user.getSalt()));
 			}
+			user.setEmail(userModel.getEmail());
 			user.setDisabled(!userModel.isEnabled());
 			userDAO.update(user);
 
diff --git a/src/main/webapp/templates/admin.useredit.html b/src/main/webapp/templates/admin.useredit.html
index 4fe5ca33..24d0ed84 100644
--- a/src/main/webapp/templates/admin.useredit.html
+++ b/src/main/webapp/templates/admin.useredit.html
@@ -24,6 +24,13 @@
 					<span class="help-block">Leave blank if you don't want to change the password.</span>
 			</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">
 			<label class="control-label" for="admin">Admin</label>
 			<div class="controls">