Removed isAdmin check in user list

alirizaadiyahsi · Nov 30, 2018 · ae49d17 · ae49d17
1 parent a2d0ead
commit ae49d17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.ts
@@ -118,11 +118,6 @@ export default class UserListComponent extends NucleusComponentBase {
         });
     }
 
-    public isAdminUser(userName: string) {
-        // todo: this is a temp solution, should check if user is in admin role
-        return userName.includes('admin');
-    }
-
     public selectAllRoles() {
         this.createOrUpdateUserInput.grantedRoleIds = [];
         if (this.selectAll) {

diff --git a/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue b/src/Nucleus.Web.Vue/src/admin/views/users/user-list.vue
@@ -76,12 +76,12 @@
                 <td>{{ props.item.userName }}</td>
                 <td>{{ props.item.email }}</td>
                 <td class="justify-center layout px-0">
-                    <v-icon v-if="!isAdminUser(props.item.userName) && nucleus.auth.isGranted('Permissions_User_Update')" small
+                    <v-icon v-if="nucleus.auth.isGranted('Permissions_User_Update')" small
                             class="mr-2"
                             @click="editUser(props.item.id)">
                         edit
                     </v-icon>
-                    <v-icon v-if="!isAdminUser(props.item.userName) && nucleus.auth.isGranted('Permissions_User_Delete')" small
+                    <v-icon v-if="nucleus.auth.isGranted('Permissions_User_Delete')" small
                             @click="deleteUser(props.item.id)">
                         delete
                     </v-icon>