Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-08 15:25:22 +02:00
Code Issues Releases Activity

Merge branch 'feat/CE-414/add-UAC-to-ACI' of https://github.com/portainer/portainer into feat/CE-414/add-UAC-to-ACI

Browse source
This commit is contained in:
Felix Han 2021-04-14 16:06:16 +12:00
commit effb0f6272
18 changed files with 410 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/portainer/models/resourceControl/resourceControlTypes.js
View file

@ -7,6 +7,7 @@ export const ResourceControlTypeString = Object.freeze({
STACK: 'stack',
VOLUME: 'volume',
CUSTOM_TEMPLATE: 'custom-template',
CONTAINER_GROUP: 'container-group',
});
/**
@ -21,4 +22,5 @@ export const ResourceControlTypeInt = Object.freeze({
STACK: 6,
CONFIG: 7,
CUSTOM_TEMPLATE: 8,
CONTAINER_GROUP: 9,
});

2
app/portainer/services/notifications.js
View file

@ -26,6 +26,8 @@ angular.module('portainer.app').factory('Notifications', [
msg = e.data.message;
} else if (e.data && e.data.content) {
msg = e.data.content;
} else if (e.data && e.data.error) {
msg = e.data.error;
} else if (e.message) {
msg = e.message;
} else if (e.err && e.err.data && e.err.data.length > 0 && e.err.data[0].message) {