Skip to content

Commit 96fdda0

Browse files
authored
Merge pull request oskariorg#1161 from DenverCoder544/user_lastlogin_and_created
add created & last login fields
2 parents 740f3b0 + 456326f commit 96fdda0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

control-admin/src/main/java/fi/nls/oskari/control/admin/UsersHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ private JSONObject user2Json(User user) throws JSONException {
209209
uo.put("lastName", user.getLastname());
210210
uo.put("user", user.getScreenname());
211211
uo.put("email", user.getEmail());
212-
212+
uo.put("created", user.getCreated());
213+
uo.put("lastLogin", user.getLastLogin());
213214
JSONArray rolesArray = new JSONArray();
214215
for (Role role : user.getRoles()) {
215216
rolesArray.put(role.getId());

0 commit comments

Comments
 (0)