Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-30 18:59:41 +02:00
Code Issues Releases Activity

fix(frontend) prevent notification showing Object Object EE-1745 (#5778)

Browse source 
* fix(frontend) prevent notification showing Object Object EE-1745

* fix(frontend) fix notification args in wrong order EE-1745

* fix(rbac) add metrics rbac for regular users EE-1745

Co-authored-by: Simon Meng <simon.meng@portainer.io>
This commit is contained in:
cong meng 2021-10-12 10:37:07 +13:00 • committed by GitHub
parent d93d88fead
commit 6a67e8142d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 45 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/docker/views/services/edit/serviceController.js
View file

@ -501,7 +501,7 @@ angular.module('portainer.docker').controller('ServiceController', [
ServiceService.update(service, config, 'previous')
.then(function (data) {
if (data.message && data.message.match(/^rpc error:/)) {
Notifications.error(data.message, 'Error');
Notifications.error('Failure', data, 'Error');
} else {
Notifications.success('Success', 'Service successfully rolled back');
$scope.cancelChanges({});
@ -550,7 +550,7 @@ angular.module('portainer.docker').controller('ServiceController', [
ServiceService.update(service, config).then(
function (data) {
if (data.message && data.message.match(/^rpc error:/)) {
Notifications.error(data.message, 'Error');
Notifications.error('Failure', data, 'Error');
} else {
Notifications.success('Service successfully updated', 'Service updated');
}