From a66e2dff4dc208345b990fce1c7dffde41246dac Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 29 Mar 2013 22:18:27 +0100
Subject: [PATCH] fix service generation

---
 .../com/commafeed/frontend/model/UserModel.java     | 13 +++++--------
 .../frontend/rest/resources/AdminUsersREST.java     |  4 +++-
 src/main/webapp/css/app.css                         |  5 +++++
 src/main/webapp/js/main.js                          |  1 -
 src/main/webapp/js/services.js                      | 12 ++++++------
 src/main/webapp/templates/admin.html                |  4 +++-
 src/main/webapp/templates/admin.users.html          | 10 ++++++++--
 7 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/model/UserModel.java b/src/main/java/com/commafeed/frontend/model/UserModel.java
index 813718ab..dc7bab5a 100644
--- a/src/main/java/com/commafeed/frontend/model/UserModel.java
+++ b/src/main/java/com/commafeed/frontend/model/UserModel.java
@@ -1,16 +1,13 @@
 package com.commafeed.frontend.model;
 
 import java.io.Serializable;
-import java.util.Set;
-
-import com.google.common.collect.Sets;
 
 @SuppressWarnings("serial")
 public class UserModel implements Serializable {
 
 	private String name;
-	private Set<String> roles = Sets.newHashSet();
 	private boolean enabled;
+	private boolean admin;
 
 	public String getName() {
 		return name;
@@ -20,12 +17,12 @@ public class UserModel implements Serializable {
 		this.name = name;
 	}
 
-	public Set<String> getRoles() {
-		return roles;
+	public boolean isAdmin() {
+		return admin;
 	}
 
-	public void setRoles(Set<String> roles) {
-		this.roles = roles;
+	public void setAdmin(boolean admin) {
+		this.admin = admin;
 	}
 
 	public boolean isEnabled() {
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AdminUsersREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AdminUsersREST.java
index bed0993a..940befc3 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/AdminUsersREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/AdminUsersREST.java
@@ -31,7 +31,9 @@ public class AdminUsersREST extends AbstractREST {
 				userModel.setEnabled(!user.isDisabled());
 				users.put(key, userModel);
 			}
-			userModel.getRoles().add(role.getRole());
+			if (Role.ADMIN.equals(role.getRole())) {
+				userModel.setAdmin(true);
+			}
 		}
 		return users.values();
 	}
diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css
index 449fd5d2..66fdfbf9 100644
--- a/src/main/webapp/css/app.css
+++ b/src/main/webapp/css/app.css
@@ -137,4 +137,9 @@
 
 #feed-accordion .entry-body h4 {
 	margin-top: 5px;
+}
+
+/* admin */
+.admin .users-table {
+	height: 400px;
 }
\ No newline at end of file
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index 833c76d3..ef64105e 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -20,7 +20,6 @@ app.config(function($routeProvider, $stateProvider, $urlRouterProvider) {
 	});
 	$stateProvider.state('admin.users', {
 		url : '/users',
-		controller : 'ManageUsersCtrl',
 		templateUrl : 'templates/admin.users.html'
 	});
 
diff --git a/src/main/webapp/js/services.js b/src/main/webapp/js/services.js
index 3dc25d5e..e5f57935 100644
--- a/src/main/webapp/js/services.js
+++ b/src/main/webapp/js/services.js
@@ -112,11 +112,11 @@ module.factory('EntryService', [ '$resource', '$http',
 					}
 				}
 			};
-			res = $resource('rest/entries/:_method', {}, actions);
+			var res = $resource('rest/entries/:_method', {}, actions);
 			return res;
 		} ]);
 
-module.service('SettingsService', function($resource) {
+module.factory('SettingsService', function($resource) {
 	var s = {}
 	s.settings = {};
 	$resource('rest/settings/get').get(function(data) {
@@ -128,16 +128,16 @@ module.service('SettingsService', function($resource) {
 	return s;
 });
 
-module.service('AdminUsersService', function($resource) {
+module.factory('AdminUsersService', function($resource) {
 	var actions = {
 		get : {
 			method : 'GET',
 			params : {
 				_method : 'get'
 			},
-			isArray : true
+			isArray: true
 		}
 	};
-	var res = $resource('rest/admin/:_method', {}, actions);
+	var res = $resource('rest/admin/users/:_method', {}, actions);
 	return res;
-})
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/main/webapp/templates/admin.html b/src/main/webapp/templates/admin.html
index f182cddd..1ee2e69a 100644
--- a/src/main/webapp/templates/admin.html
+++ b/src/main/webapp/templates/admin.html
@@ -1 +1,3 @@
-<div ui-view></div>
\ No newline at end of file
+<div class="container">
+	<div class="admin" ui-view></div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/templates/admin.users.html b/src/main/webapp/templates/admin.users.html
index bdd1620f..3e03037e 100644
--- a/src/main/webapp/templates/admin.users.html
+++ b/src/main/webapp/templates/admin.users.html
@@ -1,3 +1,9 @@
-Manage users
+<div class="row">
+	<div class="page-header">
+		<h1>Manage users</h1>
+	</div>
 
-<div ng-grid="gridOptions"></div>
+	<div ng-controller="ManageUsersCtrl">
+		<div class="users-table" ng-grid="gridOptions"></div>
+	</div>
+</div>
\ No newline at end of file