Create relation between User and Role

beeman · beeman · commit 214482e2526e · 2015-01-17T14:17:12.000+07:00
diff --git a/client/app/modules/users/controllers/users.ctrl.js b/client/app/modules/users/controllers/users.ctrl.js
@@ -56,4 +56,13 @@ angular.module('com.module.users')
         });
       });
     };
+
+    $scope.loading = true;
+    $scope.users = User.find({
+      filter: {
+        include: ['roles']
+      }
+    }, function () {
+      $scope.loading = false;
+    });
   });
diff --git a/common/models/user.json b/common/models/user.json
@@ -19,6 +19,12 @@
       "type": "hasMany",
       "model": "userCredential",
       "foreignKey": "userId"
+    },
+    "roles": {
+      "type": "hasMany",
+      "model": "Role",
+      "through": "RoleMapping",
+      "foreignKey": "principalId"
     }
   },
   "acls": [
