From e413c3ae8adfc3ecda142e66e4bef3d0d4058a5d Mon Sep 17 00:00:00 2001 From: Alex Shklianko Date: Wed, 5 Apr 2017 13:57:16 +0300 Subject: [PATCH] Edit Permissions Dialog shows incorrect content name #4752 -also fixed ui tests --- .../js/app/wizard/ContentWizardPanel.ts | 2 ++ .../spec/common/security/Principal.spec.ts | 22 ++++++++++++------- .../security/acl/AccessControlEntry.spec.ts | 3 ++- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/admin/admin-ui/src/main/resources/web/admin/apps/content-studio/js/app/wizard/ContentWizardPanel.ts b/modules/admin/admin-ui/src/main/resources/web/admin/apps/content-studio/js/app/wizard/ContentWizardPanel.ts index f8c56fb03aa..632b9f5752c 100644 --- a/modules/admin/admin-ui/src/main/resources/web/admin/apps/content-studio/js/app/wizard/ContentWizardPanel.ts +++ b/modules/admin/admin-ui/src/main/resources/web/admin/apps/content-studio/js/app/wizard/ContentWizardPanel.ts @@ -676,6 +676,8 @@ export class ContentWizardPanel extends api.app.wizard.WizardPanel { if (content.getType().isImage()) { this.updateWizard(content); + } else if (this.isSecurityWizardStepFormAllowed) { // update security wizard to have new path/displayName etc. + this.securityWizardStepForm.update(content); } return content; diff --git a/modules/admin/admin-ui/src/main/resources/web/spec/common/security/Principal.spec.ts b/modules/admin/admin-ui/src/main/resources/web/spec/common/security/Principal.spec.ts index 7a19bfbe80d..f986c3d57c1 100644 --- a/modules/admin/admin-ui/src/main/resources/web/spec/common/security/Principal.spec.ts +++ b/modules/admin/admin-ui/src/main/resources/web/spec/common/security/Principal.spec.ts @@ -14,26 +14,32 @@ describe('api.security.Principal', () => { it('given an equal then true is returned', () => { - let principal1 = Principal.create().setKey(PrincipalKey.ofAnonymous()).setDisplayName('Anon').setModifiedTime(now).build(); - let principal2 = Principal.create().setKey(PrincipalKey.ofAnonymous()).setDisplayName('Anon').setModifiedTime(now).build(); + let principal1: Principal = Principal.create().setModifiedTime(now).setKey( + PrincipalKey.ofAnonymous()).setDisplayName('Anon').build(); + let principal2: Principal = Principal.create().setModifiedTime(now).setKey( + PrincipalKey.ofAnonymous()).setDisplayName('Anon').build(); expect(principal1.equals(principal2)).toBeTruthy(); }); it('given unequal displayName then false is returned', () => { - let principal1 = Principal.create().setKey(PrincipalKey.ofAnonymous()).setDisplayName('Anon').setModifiedTime(now).build(); - let principal2 = Principal.create().setKey(PrincipalKey.ofAnonymous()).setDisplayName('Other').setModifiedTime(now).build(); + let principal1: Principal = Principal.create().setModifiedTime(now).setKey( + PrincipalKey.ofAnonymous()).setDisplayName('Anon').build(); + let principal2: Principal = Principal.create().setModifiedTime(now).setKey( + PrincipalKey.ofAnonymous()).setDisplayName('Other').build(); expect(principal1.equals(principal2)).toBeFalsy(); }); it('given unequal type then false is returned', () => { - let principal1 = Principal.create().setKey(PrincipalKey.fromString('user:mystore:other')).setDisplayName( - 'Anon').setModifiedTime(now).build(); - let principal2 = Principal.create().setKey(PrincipalKey.fromString('user:mystore:other')).setDisplayName( - 'Anon').setModifiedTime(later).build(); + let principal1: Principal = Principal.create().setModifiedTime(now).setKey( + PrincipalKey.fromString('user:mystore:other')).setDisplayName( + 'Anon').build(); + let principal2: Principal = Principal.create().setModifiedTime(later).setKey( + PrincipalKey.fromString('user:mystore:other')).setDisplayName( + 'Anon').build(); expect(principal1.equals(principal2)).toBeFalsy(); }); diff --git a/modules/admin/admin-ui/src/main/resources/web/spec/common/security/acl/AccessControlEntry.spec.ts b/modules/admin/admin-ui/src/main/resources/web/spec/common/security/acl/AccessControlEntry.spec.ts index 4468fd6cba6..ba2e5315ae5 100644 --- a/modules/admin/admin-ui/src/main/resources/web/spec/common/security/acl/AccessControlEntry.spec.ts +++ b/modules/admin/admin-ui/src/main/resources/web/spec/common/security/acl/AccessControlEntry.spec.ts @@ -11,7 +11,8 @@ describe('api.security.acl.AccessControlEntry', () => { describe('equals', () => { - let principal1 = Principal.create().setKey(PrincipalKey.ofAnonymous()).setDisplayName('principal1').setModifiedTime(now).build(); + let principal1: Principal = Principal.create().setModifiedTime(now).setKey(PrincipalKey.ofAnonymous()).setDisplayName( + 'principal1').build(); it('given an equal then true is returned', () => {