Merge branch 'rel-7.0' of https://github.com/abpframework/abp into rel-7.0

npm/ng-packs/packages/core/src/lib/services/session-state.service.ts

@@ -31,7 +31,7 @@ export class SessionStateService {
   }
 
   private setInitialLanguage() {
-    if (this.getLanguage()) return;
+    const appLanguage = this.getLanguage();
 
     this.configState
       .getDeep$('localization.currentCulture.cultureName')
@@ -43,8 +43,9 @@ export class SessionStateService {
         if (lang.includes(';')) {
           lang = lang.split(';')[0];
         }
-
+        if (appLanguage !== lang) {
-        this.setLanguage(lang);
+          this.setLanguage(lang);
+        }
       });
   }
 

npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

@@ -164,25 +164,16 @@ export class PermissionManagementComponent
       return;
 
     setTimeout(() => {
-      this.permissions = this.permissions
+      this.permissions = this.permissions.map(per => {
-        .map(per => {
+        if (clickedPermission.name === per.name) {
-          if (clickedPermission.name === per.name) {
+          return { ...per, isGranted: !per.isGranted };
-            return { ...per, isGranted: !per.isGranted };
+        } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) {
-          } else if (clickedPermission.name === per.parentName && clickedPermission.isGranted) {
+          return { ...per, isGranted: false };
-            return { ...per, isGranted: false };
+        } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) {
-          } else if (clickedPermission.parentName === per.name && !clickedPermission.isGranted) {
+          return { ...per, isGranted: true };
-            return { ...per, isGranted: true };
+        }
-          }
+        return per;
-
+      });
-          return per;
-        })
-        .map((per, index, permissions) => {
-          const childrens = permissions.filter(p => p.parentName === per.name);
-          if (childrens.length > 0 && childrens.every(x => !x.isGranted)) {
-            return { ...per, isGranted: false };
-          }
-          return per;
-        });
       this.setTabCheckboxState();
       this.setGrantCheckboxState();
     }, 0);