Merge pull request #4779 from enonic/issue-4752

Edit Permissions Dialog shows incorrect content name #4752
enonic · Apr 6, 2017 · 214b708 · 214b708
2 parents 48475d8 + e413c3a
commit 214b708
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/...n-ui/src/main/resources/web/admin/apps/content-studio/js/app/wizard/ContentWizardPanel.ts b/...n-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<Content> {
 
             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
@@ -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>Principal.create().setModifiedTime(now).setKey(
+                PrincipalKey.ofAnonymous()).setDisplayName('Anon').build();
+            let principal2: Principal = <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>Principal.create().setModifiedTime(now).setKey(
+                PrincipalKey.ofAnonymous()).setDisplayName('Anon').build();
+            let principal2: Principal = <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>Principal.create().setModifiedTime(now).setKey(
+                PrincipalKey.fromString('user:mystore:other')).setDisplayName(
+                'Anon').build();
+            let principal2: Principal = <Principal>Principal.create().setModifiedTime(later).setKey(
+                PrincipalKey.fromString('user:mystore:other')).setDisplayName(
+                'Anon').build();
 
             expect(principal1.equals(principal2)).toBeFalsy();
         });

diff --git a/...admin/admin-ui/src/main/resources/web/spec/common/security/acl/AccessControlEntry.spec.ts b/...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>Principal.create().setModifiedTime(now).setKey(PrincipalKey.ofAnonymous()).setDisplayName(
+            'principal1').build();
 
         it('given an equal then true is returned', () => {