diff --git a/src/components/Users/Item.vue b/src/components/Users/Item.vue
index 3f46f3b..73b7869 100644
--- a/src/components/Users/Item.vue
+++ b/src/components/Users/Item.vue
@@ -104,8 +104,8 @@ export default {
});
},
chageRole() {
- this.$emit("userId", this.user.id);
this.$_openModal("changeRole", {
+ userId: this.user.id,
role: this.user.role_id ? this.user.role_id : null,
roles: this.getRoles,
});
diff --git a/src/components/Users/Items.vue b/src/components/Users/Items.vue
index 1ce312f..60561d8 100644
--- a/src/components/Users/Items.vue
+++ b/src/components/Users/Items.vue
@@ -44,17 +44,14 @@
-
+
-
-
@@ -79,7 +76,6 @@ export default {
},
data: () => ({
role: UserStorage.getRole() ? UserStorage.getRole() : null,
- id: null,
}),
computed: {
...mapGetters("users", [
@@ -111,10 +107,9 @@ export default {
}
},
async load() {
- this.role === "admin" ? await this.loadUsers() : await this.loadTrainerTrainee();
- },
- userId(id) {
- this.id = id;
+ this.role === "admin"
+ ? await this.loadUsers()
+ : await this.loadTrainerTrainee();
},
},
async created() {
diff --git a/src/components/Users/Modals/ChangeRoleModal.vue b/src/components/Users/Modals/ChangeRoleModal.vue
index cfb84ec..42cfdad 100644
--- a/src/components/Users/Modals/ChangeRoleModal.vue
+++ b/src/components/Users/Modals/ChangeRoleModal.vue
@@ -67,23 +67,22 @@ import { mapActions } from "vuex";
import toast from "@/utils/toast";
export default {
name: "modal_changeRole",
- props: {
- userId: {},
- },
data: () => ({
role_id: null,
currectRoleId: null,
changeRoleRequestLoading: false,
roles: null,
+ user_id: null,
}),
computed: {
form() {
- return { userId: this.userId };
+ return { userId: this.user_id };
},
},
methods: {
...mapActions("users", ["updateRole"]),
- openModal({ role, roles }) {
+ openModal({ role, roles, userId }) {
+ this.user_id = userId;
this.roles = { ...roles };
this.currectRoleId = role ? role : 0;
this.role_id = role ? role : 0;
diff --git a/src/views/Users.vue b/src/views/Users.vue
index d472225..7452f80 100644
--- a/src/views/Users.vue
+++ b/src/views/Users.vue
@@ -22,14 +22,10 @@
\ No newline at end of file