summaryrefslogtreecommitdiffstats
path: root/server/models
diff options
context:
space:
mode:
authorChristian Hofmaier2019-02-25 04:25:08 +0100
committerChristian Hofmaier2019-02-25 04:25:08 +0100
commit7b098c8b969a1d283a94391d9d8050ad0c5a4d13 (patch)
tree82d9f6edbc4503d3419a41626a986c4797478c8d /server/models
parent[webapp/datatable] improved slim mode (diff)
downloadbas-7b098c8b969a1d283a94391d9d8050ad0c5a4d13.tar.gz
bas-7b098c8b969a1d283a94391d9d8050ad0c5a4d13.tar.xz
bas-7b098c8b969a1d283a94391d9d8050ad0c5a4d13.zip
[permissionmanager] rework for blacklist system
- integrate PM into PM itself - wildcard function for hasPermission()
Diffstat (limited to 'server/models')
-rw-r--r--server/models/iprange.js2
-rw-r--r--server/models/registrationhook.js6
-rw-r--r--server/models/role.js7
3 files changed, 8 insertions, 7 deletions
diff --git a/server/models/iprange.js b/server/models/iprange.js
index c0975e4..0792a15 100644
--- a/server/models/iprange.js
+++ b/server/models/iprange.js
@@ -16,4 +16,4 @@ module.exports = (sequelize, DataTypes) => {
iprange.belongsTo(models.group)
}
return iprange
-} \ No newline at end of file
+}
diff --git a/server/models/registrationhook.js b/server/models/registrationhook.js
index 0d1ea6e..25fc0f0 100644
--- a/server/models/registrationhook.js
+++ b/server/models/registrationhook.js
@@ -14,9 +14,9 @@ module.exports = (sequelize, DataTypes) => {
script: {
allowNull: true,
type: DataTypes.BLOB,
- get() {
+ get () {
var blob = this.getDataValue('script')
- return blob ? blob.toString() : '';
+ return blob ? blob.toString() : ''
}
}
}, {
@@ -27,4 +27,4 @@ module.exports = (sequelize, DataTypes) => {
registrationhook.belongsToMany(models.group, { as: 'groups', through: RegistrationhookXGroup, foreignKey: 'registrationhookId', otherKey: 'groupId' })
}
return registrationhook
-} \ No newline at end of file
+}
diff --git a/server/models/role.js b/server/models/role.js
index f88c132..8588ab5 100644
--- a/server/models/role.js
+++ b/server/models/role.js
@@ -8,8 +8,7 @@ module.exports = (sequelize, DataTypes) => {
type: DataTypes.INTEGER
},
name: DataTypes.STRING,
- descr: DataTypes.STRING(2048),
- recursiveGroups: DataTypes.BOOLEAN
+ descr: DataTypes.STRING(2048)
}, {
timestamps: false
})
@@ -17,7 +16,9 @@ module.exports = (sequelize, DataTypes) => {
var RoleXPermission = sequelize.define('role_x_permission', {}, { timestamps: false, freezeTableName: true })
role.belongsToMany(models.permission, { as: 'permissions', through: RoleXPermission, foreignKey: 'roleId', otherKey: 'permissionId' })
- var RoleXGroup = sequelize.define('role_x_group', {}, { timestamps: false, freezeTableName: true })
+ var RoleXGroup = sequelize.define('role_x_group', {
+ blacklist: DataTypes.BOOLEAN
+ }, { timestamps: false, freezeTableName: true })
role.belongsToMany(models.group, { as: 'groups', through: RoleXGroup, foreignKey: 'roleId', otherKey: 'groupId' })
}