ソースを参照

Fix potential circular dependency issues and update README to reflect new login API

Matt Coles 9 年 前
コミット
32d22d75b0
共有1 個のファイルを変更した3 個の追加3 個の削除を含む
  1. 3 3
      controllers/permissions-controller.js

+ 3 - 3
controllers/permissions-controller.js

@@ -1,4 +1,3 @@
1
-var society_controller = require("./society-controller.js");
2 1
 var bcrypt = require("bcrypt-nodejs");
3 2
 
4 3
 module.exports = {
@@ -17,6 +16,7 @@ module.exports = {
17 16
 
18 17
   user_can_view_soc_events: function (auth, society, complete) {
19 18
     var user_controller = require("./user-controller.js");
19
+    var society_controller = require("./society-controller.js");
20 20
     user_controller.get_user_from_auth(auth, function (username) {
21 21
       if (!username) {
22 22
         complete(false);
@@ -34,6 +34,7 @@ module.exports = {
34 34
 
35 35
   user_can_manage_soc_events: function (auth, society, complete) {
36 36
     var user_controller = require("./user-controller.js");
37
+    var society_controller = require("./society-controller.js");
37 38
     user_controller.get_user_from_auth(auth, function(username) {
38 39
       if (!username) {
39 40
         complete(false);
@@ -50,8 +51,7 @@ module.exports = {
50 51
   },
51 52
 
52 53
   user_can_manage_society: function (auth, society, complete) {
53
-    var user_controller = require("./user-controller.js");
54
-    user_can_manage_soc_events(auth, society, function (permission) {
54
+    this.user_can_manage_soc_events(auth, society, function (permission) {
55 55
       complete(permission);
56 56
     });
57 57
   }