KYLO-2810 UI doesnt allow changing permissions of feed when permitted

chandrasaripaka · Dec 7, 2018 · b1967e0 · b1967e0
1 parent d9e518e
commit b1967e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...esources/static/js/feed-mgr/feeds/define-feed-ng2/services/feed-access-control.service.ts b/...esources/static/js/feed-mgr/feeds/define-feed-ng2/services/feed-access-control.service.ts
@@ -61,8 +61,8 @@ constructor(@Inject("AccessControlService") private accessControlService:AccessC
                     subject.next( new FeedAccessControl({
                         accessMessage:accessMessage,
                     datasourceAccess:datasourceAccess,
-                    allowEdit : entityEditAccess && allowEditAccess && datasourceAccess,
-                    allowChangePermissions : entityAccessControlled && entityPermissionAccess && allowEditAccess,
+                    allowEdit : entityEditAccess && (allowEditAccess || allowAdminAccess) && datasourceAccess,
+                    allowChangePermissions : entityAccessControlled && entityPermissionAccess && (allowEditAccess || allowAdminAccess),
                     allowAdmin : allowAdminAccess,
                     allowSlaAccess : slaAccess,
                     allowExport : entityExportAccess && allowExport,

diff --git a/.../js/feed-mgr/feeds/define-feed-ng2/steps/permissions/define-feed-permissions.component.ts b/.../js/feed-mgr/feeds/define-feed-ng2/steps/permissions/define-feed-permissions.component.ts
@@ -48,7 +48,7 @@ export class DefineFeedPermissionsComponent extends AbstractFeedStepComponent {
     checkEntityAccess() {
         let entityAccessControlCheck:Observable<boolean> = of(this.accessControlService.checkEntityAccessControlled());
         entityAccessControlCheck.subscribe((result: any) => {
-                this.displayEditActions = this.accessControlService.isEntityAccessControlled() && this.feed.accessControl.allowAdmin;
+                this.displayEditActions = this.accessControlService.isEntityAccessControlled() && this.feed.accessControl.allowChangePermissions;
             }, (err: any) => {
                 console.log("Error checking if entity access control is enabled");
             });

diff --git a/...ed-mgr/feeds/define-feed-ng2/summary/setup-guide-summary/setup-guide-summary.component.ts b/...ed-mgr/feeds/define-feed-ng2/summary/setup-guide-summary/setup-guide-summary.component.ts
@@ -157,7 +157,7 @@ export class SetupGuideSummaryComponent extends AbstractLoadFeedComponent  {
      * @returns {boolean}
      */
     showSetPermissions() {
-        return this.feed.accessControl.allowAdmin;
+        return this.feed.accessControl.allowChangePermissions;
     }
 
     /**