slight modification to make permissions work for front end

shsu · Mar 23, 2014 · fc5dd05 · fc5dd05
1 parent 8d54e60
commit fc5dd05
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/src/main/java/ca/bcit/infosys/comp4911/services/UserResource.java b/src/main/java/ca/bcit/infosys/comp4911/services/UserResource.java
@@ -8,6 +8,7 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import javax.ejb.EJB;
@@ -135,27 +136,34 @@ public Response getUserPermissions(
 
         int userId = userTokens.verifyTokenAndReturnUserID(headerToken, queryToken);
 
+        JSONArray permissionArray = new JSONArray();
+        JSONObject temp = new JSONObject();
 
-        JSONObject permissions = new JSONObject();
         if(userDao.read(userId).isHR()){
-            permissions.append("name", "HR");
+            temp.put("name", "Hr");
+            permissionArray.put(temp);
         }
         if(projectAssignmentDao.isProjectManager(userId)) {
-            permissions.append("name", "ProjectManager");
+            temp = new JSONObject();
+            temp.put("name", "ProjectManager");
+            permissionArray.put(temp);
         }
         if(userDao.isSupervisor(userId)) {
-            permissions.append("name", "Supervisor");
+            temp = new JSONObject();
+            temp.put("name", "Supervisor");
+            permissionArray.put(temp);
         }
         if(userDao.isTimesheetApprover(userId)){
-            permissions.append("name", "TimsheetApprover");
-
+            temp = new JSONObject();
+            temp.put("name", "TimesheetApprover");
+            permissionArray.put(temp);
         }
         if(workPackageAssignmentDao.isResponsibleEngineer(userId)) {
-            permissions.append("name", "ResponsibleEngineer");
+            temp = new JSONObject();
+            temp.put("name", "ResponsibleEngineer");
+            permissionArray.put(temp);
         }
-
-        return SH.responseWithEntity(200, permissions.toString());
-
+        return SH.responseWithEntity(200, permissionArray.toString());
     }
 
     @Path("/projects")

diff --git a/src/main/webapp/js/services.js b/src/main/webapp/js/services.js
@@ -42,8 +42,8 @@ cascadiaServices.factory('permissions',
       hasPermission: function(permission) {
         permission = permission.trim();
         return _.some(permissionList, function(item) {
-          if(_.isString(item.Name))
-            return item.Name.trim() === permission
+          if(_.isString(item.name))
+            return item.name.trim() === permission
         });
       }
     };