Просмотр исходного кода

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

Matt Coles лет назад: 9
Родитель
Сommit
32d22d75b0
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      controllers/permissions-controller.js

+ 3 - 3
controllers/permissions-controller.js

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