requested changes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
This commit is contained in:
parent
3b69d76525
commit
cc806cc08f
|
@ -7,9 +7,7 @@ module.exports = Self => {
|
|||
const user = await ctx.instance.userFk;
|
||||
const modifiedUser = await getUserToModify(null, user, models);
|
||||
|
||||
if (userId == modifiedUser.id || userId == modifiedUser.bossFk)
|
||||
return;
|
||||
else
|
||||
if (userId != modifiedUser.id && userId != modifiedUser.bossFk)
|
||||
throw new UserError('You dont have permission to modify this user');
|
||||
});
|
||||
|
||||
|
@ -42,14 +40,13 @@ module.exports = Self => {
|
|||
const user = ctx.req.accessToken.userId;
|
||||
const modifiedUser = await getUserToModify(notificationId, null, models);
|
||||
|
||||
if (user == modifiedUser.id || modifiedUser.bossFk == user) {
|
||||
await models.NotificationSubscription.destroyById(notificationId);
|
||||
return;
|
||||
} else
|
||||
if (user != modifiedUser.id && user != modifiedUser.bossFk)
|
||||
throw new UserError('You dont have permission to modify this user');
|
||||
|
||||
await models.NotificationSubscription.destroyById(notificationId);
|
||||
};
|
||||
|
||||
async function getUserToModify(notificationId = null, userFk = null, models) {
|
||||
async function getUserToModify(notificationId, userFk, models) {
|
||||
if (notificationId != null) {
|
||||
const subscription = await models.NotificationSubscription.findById(notificationId);
|
||||
const user = await subscription.userFk;
|
||||
|
|
|
@ -19726,10 +19726,11 @@ DROP TABLE IF EXISTS `notificationSubscription`;
|
|||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `notificationSubscription` (
|
||||
`Id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`notificationFk` int(11) NOT NULL,
|
||||
`userFk` int(10) unsigned NOT NULL,
|
||||
PRIMARY KEY (`Id`),
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `notificationSubscription_ibfk_1` (`notificationFk`),
|
||||
KEY `notificationSubscription_ibfk_2` (`userFk`),
|
||||
CONSTRAINT `notificationSubscription_ibfk_1` FOREIGN KEY (`notificationFk`) REFERENCES `notification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
|
||||
CONSTRAINT `notificationSubscription_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
|
||||
|
|
Loading…
Reference in New Issue