From: Lenz Grimmer <lenz@grimmer.com>
Date: Wed, 5 Sep 2018 12:57:17 +0000 (+0200)
Subject: Merge pull request #23409 from ricardoasmarques/wip-role-management
X-Git-Tag: v14.0.1~404
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c1f8b69f5a5e46a2e66826e12cf54baccce7323;p=ceph.git

Merge pull request #23409 from ricardoasmarques/wip-role-management

mgr/dashboard: Role management from the UI

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

2c1f8b69f5a5e46a2e66826e12cf54baccce7323
diff --cc src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.ts
index aba99b025186,dfc41ab7ed65..c1a7be7e9762
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.ts
@@@ -132,9 -132,10 +132,9 @@@ export class UserFormComponent implemen
        () => {
          this.notificationService.show(
            NotificationType.success,
 -          `User "${userFormModel.username}" has been created.`,
 -          'Create User'
 +          `Created user "${userFormModel.username}"`
          );
-         this.router.navigate(['/users']);
+         this.router.navigate(['/user-management/users']);
        },
        () => {
          this.userForm.setErrors({ cdSubmitButton: true });
@@@ -208,9 -209,10 +208,9 @@@
          } else {
            this.notificationService.show(
              NotificationType.success,
 -            `User "${userFormModel.username}" has been updated.`,
 -            'Edit User'
 +            `Updated user "${userFormModel.username}"`
            );
-           this.router.navigate(['/users']);
+           this.router.navigate(['/user-management/users']);
          }
        },
        () => {