Fixed bug with org chart security tokens

prs.desktop/Grids/EmployeePositionGrid.cs

@@ -9,11 +9,14 @@ namespace PRSDesktop
     {
         protected override BaseEditor? GetEditor(object item, DynamicGridColumn column)
         {
-            if (!Security.IsAllowed<CanEditOrgChart>())
-                return new NullEditor();
-            var orgChartSettings = new GlobalConfiguration<OrgChartSettings>().Load();
-            if (column.ColumnName.StartsWith($"{nameof(Role.OrgChart)}.") && orgChartSettings.Layout != OrgChartLayout.Position)
-                return new NullEditor();
+            if (column.ColumnName.StartsWith($"{nameof(EmployeePosition.OrgChart)}."))
+            {
+                if (!Security.IsAllowed<CanEditOrgChart>())
+                    return new NullEditor();
+                var orgChartSettings = new GlobalConfiguration<OrgChartSettings>().Load();
+                if (orgChartSettings.Layout != OrgChartLayout.Position)
+                    return new NullEditor();
+            }
             return base.GetEditor(item, column);
         }
     }

prs.desktop/Grids/RoleGrid.cs

@@ -9,11 +9,14 @@ namespace PRSDesktop
     {
         protected override BaseEditor? GetEditor(object item, DynamicGridColumn column)
         {
-            if(!Security.IsAllowed<CanEditOrgChart>())
-                return new NullEditor();
-            var orgChartSettings = new GlobalConfiguration<OrgChartSettings>().Load();
-            if (column.ColumnName.StartsWith($"{nameof(Role.OrgChart)}.") && orgChartSettings.Layout != OrgChartLayout.Role)
-                return new NullEditor();
+            if (column.ColumnName.StartsWith($"{nameof(Role.OrgChart)}."))
+            {
+                if (!Security.IsAllowed<CanEditOrgChart>())
+                    return new NullEditor();
+                var orgChartSettings = new GlobalConfiguration<OrgChartSettings>().Load();
+                if (orgChartSettings.Layout != OrgChartLayout.Role)
+                    return new NullEditor();
+            }
             return base.GetEditor(item, column);
         }
     }

prs.desktop/Panels/Employees/EmployeeGrid.cs

@@ -229,11 +229,14 @@ namespace PRSDesktop
 
         protected override BaseEditor? GetEditor(object item, DynamicGridColumn column)
         {
-            if (!Security.IsAllowed<CanEditOrgChart>())
-                return new NullEditor();
-            var orgChartSettings = new GlobalConfiguration<OrgChartSettings>().Load();
-            if (column.ColumnName.StartsWith($"{nameof(Role.OrgChart)}.") && orgChartSettings.Layout != OrgChartLayout.Employee)
-                return new NullEditor();
+            if (column.ColumnName.StartsWith($"{nameof(Employee.OrgChart)}."))
+            {
+                if (!Security.IsAllowed<CanEditOrgChart>())
+                    return new NullEditor();
+                var orgChartSettings = new GlobalConfiguration<OrgChartSettings>().Load();
+                if (orgChartSettings.Layout != OrgChartLayout.Employee)
+                    return new NullEditor();
+            }
             return base.GetEditor(item, column);
         }