link between servers & groups, clean, bug fix
This commit is contained in:
30
routes/admin/accesses.route.js
Normal file
30
routes/admin/accesses.route.js
Normal file
@@ -0,0 +1,30 @@
|
||||
const express = require('express');
|
||||
groupService = require("../../services/groups.service");
|
||||
memberService = require("../../services/members.service");
|
||||
accessesService = require("../../services/accesses.service");
|
||||
|
||||
var router = express.Router();
|
||||
|
||||
router.get('/:name/add/:server', (req, res) => {
|
||||
try {
|
||||
accessesService.addAccess(req.params.server, req.params.name).then((result) => {
|
||||
res.redirect('/admin/groups/' + req.params.name)
|
||||
});
|
||||
} catch(e) {
|
||||
console.log(e)
|
||||
}
|
||||
})
|
||||
|
||||
router.get('/:name/delete/:server', (req, res) => {
|
||||
try {
|
||||
accessesService.delAccess(req.params.server, req.params.name).then((result) => {
|
||||
res.redirect('/admin/groups/' + req.params.name)
|
||||
});
|
||||
} catch(e) {
|
||||
console.log(e)
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
module.exports = router;
|
||||
@@ -1,10 +1,13 @@
|
||||
const express = require('express');
|
||||
|
||||
const User = require("../../model/user.model");
|
||||
const Group = require("../../model/group.model");
|
||||
groupService = require("../../services/group.service");
|
||||
memberService = require("../../services/members.service");
|
||||
var router = express.Router();
|
||||
const Server = require("../../model/server.model");
|
||||
|
||||
groupService = require("../../services/groups.service");
|
||||
memberService = require("../../services/members.service");
|
||||
|
||||
var router = express.Router();
|
||||
|
||||
router.get("/", (req, res) => {
|
||||
try {
|
||||
@@ -52,7 +55,16 @@ router.get("/:name", async (req, res) => {
|
||||
delete users[user]
|
||||
}
|
||||
}
|
||||
res.render('admin/group_edit', { "group": group, "inGroup": result, "outGroup": users })
|
||||
groupService.groupServerList(req.params.name).then((result2) => {
|
||||
Server.findAll().then((servers) => {
|
||||
for (server in servers) {
|
||||
if (JSON.stringify(result2).includes(servers[server].dataValues.hostname)) {
|
||||
delete servers[server]
|
||||
}
|
||||
}
|
||||
res.render('admin/group_edit', { "group": group, "inGroup": result, "outGroup": users, "inServer": result2, "outServer": servers});
|
||||
});
|
||||
})
|
||||
});
|
||||
})
|
||||
});
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
const express = require('express');
|
||||
const User = require("../../model/user.model");
|
||||
const Group = require("../../model/group.model");
|
||||
groupService = require("../../services/group.service");
|
||||
const Member = require("../../model/member.model");
|
||||
|
||||
groupService = require("../../services/groups.service");
|
||||
memberService = require("../../services/members.service");
|
||||
|
||||
var router = express.Router();
|
||||
|
||||
router.get('/:name/add/:user', (req, res) => {
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
const express = require('express');
|
||||
const User = require("../../model/user.model");
|
||||
const Group = require("../../model/group.model");
|
||||
|
||||
const Server = require("../../model/server.model");
|
||||
|
||||
memberService = require("../../services/members.service");
|
||||
serverService = require("../../services/server.service");
|
||||
|
||||
var router = express.Router();
|
||||
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
const express = require('express');
|
||||
const User = require("../../model/user.model");
|
||||
const Group = require("../../model/group.model");
|
||||
const Key = require("../../model/key.model");
|
||||
const keyService = require("../../services/keys.service");
|
||||
groupService = require("../../services/group.service");
|
||||
|
||||
keyService = require("../../services/keys.service");
|
||||
groupService = require("../../services/groups.service");
|
||||
memberService = require("../../services/members.service");
|
||||
userService = require("../../services/users.service");
|
||||
|
||||
var router = express.Router();
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user