OHRM5X-604: Fix pim report to action buttons are not placed in the co…

…rrect order (orangehrm#971)
RajithaKumara · Nov 17, 2021 · 1dc5cc9 · 1dc5cc9
1 parent 43ffab8
commit 1dc5cc9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/symfony/client/src/orangehrmPimPlugin/components/EmployeeSubordinates.vue b/symfony/client/src/orangehrmPimPlugin/components/EmployeeSubordinates.vue
@@ -231,14 +231,6 @@ export default {
         cellType: 'oxd-table-cell-actions',
         cellConfig: {},
       };
-      if (this.$can.update(`subordinates`)) {
-        headerActions.cellConfig.edit = {
-          onClick: this.onClickEdit,
-          props: {
-            name: 'pencil-fill',
-          },
-        };
-      }
       if (this.$can.delete(`subordinates`)) {
         headerActions.cellConfig.delete = {
           onClick: this.onClickDelete,
@@ -248,6 +240,14 @@ export default {
           },
         };
       }
+      if (this.$can.update(`subordinates`)) {
+        headerActions.cellConfig.edit = {
+          onClick: this.onClickEdit,
+          props: {
+            name: 'pencil-fill',
+          },
+        };
+      }
       return Object.keys(headerActions.cellConfig).length > 0
         ? this.headers.concat([headerActions])
         : this.headers;

diff --git a/symfony/client/src/orangehrmPimPlugin/components/EmployeeSupervisors.vue b/symfony/client/src/orangehrmPimPlugin/components/EmployeeSupervisors.vue
@@ -231,14 +231,6 @@ export default {
         cellType: 'oxd-table-cell-actions',
         cellConfig: {},
       };
-      if (this.$can.update(`supervisor`)) {
-        headerActions.cellConfig.edit = {
-          onClick: this.onClickEdit,
-          props: {
-            name: 'pencil-fill',
-          },
-        };
-      }
       if (this.$can.delete(`supervisor`)) {
         headerActions.cellConfig.delete = {
           onClick: this.onClickDelete,
@@ -248,6 +240,14 @@ export default {
           },
         };
       }
+      if (this.$can.update(`supervisor`)) {
+        headerActions.cellConfig.edit = {
+          onClick: this.onClickEdit,
+          props: {
+            name: 'pencil-fill',
+          },
+        };
+      }
       return Object.keys(headerActions.cellConfig).length > 0
         ? this.headers.concat([headerActions])
         : this.headers;