Rooba
/
tacticalrmm
mirror of https://github.com/amidaware/tacticalrmm.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small fixes, highlight row when selected

This commit is contained in:
wh1te909 2020-08-20 20:04:41 +00:00
parent 68c9a31f46
commit 622eb23fe0
4 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/tacticalrmm/accounts/urls.py
View File

@ -3,7 +3,7 @@ from . import views
urlpatterns = [
path("users/", views.GetAddUsers.as_view()),
path("users/<int:pk>/", views.GetUpdateDeleteUser.as_view()),
path("<int:pk>/users/", views.GetUpdateDeleteUser.as_view()),
path("users/reset/", views.UserActions.as_view()),
path("users/reset_totp/", views.UserActions.as_view()),
path("users/setup_totp/", views.TOTPSetup.as_view()),

21
api/tacticalrmm/accounts/views.py
View File

@ -25,7 +25,7 @@ class CheckCreds(KnoxLoginView):
serializer = AuthTokenSerializer(data=request.data)
serializer.is_valid(raise_exception=True)
user = User.objects.get(username=request.data["username"])
user = get_object_or_404(User, username=request.data["username"])
if not user.totp_key:
return Response("totp not set")
@ -68,18 +68,15 @@ class GetAddUsers(APIView):
def post(self, request):
# Remove password from serializer
password = request.data.pop("password")
serializer = UserSerializer(data=request.data, partial=True)
serializer.is_valid(raise_exception=True)
user = serializer.save()
user = User.objects.create_user(
request.data["username"], request.data["email"], request.data["password"]
)
user.first_name = request.data["first_name"]
user.last_name = request.data["last_name"]
# Can be changed once permissions and groups are introduced
user.is_superuser = True
user.set_password = password
user.save()
return Response("ok")
@ -99,7 +96,7 @@ class GetUpdateDeleteUser(APIView):
return Response("ok")
def delete(self, request, pk):
User.objects.get(pk=pk).delete()
get_object_or_404(User, pk=pk).delete()
return Response("ok")
@ -109,7 +106,7 @@ class UserActions(APIView):
# reset password
def post(self, request):
user = User.objects.get(pk=request.data["id"])
user = get_object_or_404(User, pk=request.data["id"])
user.set_password(request.data["password"])
user.save()
@ -118,7 +115,7 @@ class UserActions(APIView):
# reset two factor token
def put(self, request):
user = User.objects.get(pk=request.data["id"])
user = get_object_or_404(User, pk=request.data["id"])
user.totp_key = ""
user.save()

58
web/src/components/AdminManager.vue
View File

@ -80,7 +80,13 @@
</template>
<!-- body slots -->
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer" @click="props.selected = true">
<q-tr
:props="props"
class="cursor-pointer"
:class="{highlight: selected.length !== 0 && selected[0].id === props.row.id}"
@click="props.selected = true"
@contextmenu="editUserId = props.row.id; props.selected = true"
>
<!-- context menu -->
<q-menu context-menu>
<q-list dense style="min-width: 200px">
@ -121,12 +127,7 @@
<q-item-section>Reset Password</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="reset2FA(props.row)"
id="context-reset"
>
<q-item clickable v-close-popup @click="reset2FA(props.row)" id="context-reset">
<q-item-section side>
<q-icon name="autorenew" />
</q-item-section>
@ -142,11 +143,7 @@
</q-menu>
<!-- enabled checkbox -->
<q-td>
<q-checkbox
dense
@input="toggleEnabled(props.row)"
v-model="props.row.is_active"
/>
<q-checkbox dense @input="toggleEnabled(props.row)" v-model="props.row.is_active" />
</q-td>
<q-td>{{ props.row.username }}</q-td>
<q-td>{{ props.row.first_name }} {{ props.row.last_name }}</q-td>
@ -167,7 +164,6 @@
<q-dialog v-model="showResetPasswordModal" @hide="closeResetPasswordModal">
<UserResetPasswordForm :pk="resetUserId" @close="closeResetPasswordModal" />
</q-dialog>
</div>
</template>
@ -195,24 +191,24 @@ export default {
name: "name",
label: "Name",
field: "name",
align: "left"
align: "left",
},
{
name: "email",
label: "Email",
field: "email",
align: "left"
align: "left",
},
{
name: "last_login",
label: "Last Login",
field: "last_login",
align: "left"
align: "left",
},
],
pagination: {
rowsPerPage: 9999
}
rowsPerPage: 9999,
},
};
},
methods: {
@ -220,22 +216,22 @@ export default {
this.$store.dispatch("admin/loadUsers");
},
clearRow() {
this.selected = []
this.selected = [];
},
refresh() {
this.getUsers();
this.clearRow();
},
deleteUser(id) {
deleteUser(data) {
this.$q
.dialog({
title: "Delete user?",
cancel: true,
ok: { label: "Delete", color: "negative" }
ok: { label: "Delete", color: "negative" },
})
.onOk(() => {
this.$store
.dispatch("admin/deleteUser", id)
.dispatch("admin/deleteUser", data.id)
.then(response => {
this.$q.notify(notifySuccessConfig("User was deleted!"));
})
@ -244,8 +240,8 @@ export default {
});
});
},
showEditUserModal(id) {
this.editUserId = id;
showEditUserModal(data) {
this.editUserId = data.id;
this.showUserFormModal = true;
},
closeUserFormModal() {
@ -257,12 +253,11 @@ export default {
this.showUserFormModal = true;
},
toggleEnabled(user) {
let text = user.is_active ? "User enabled successfully" : "User disabled successfully";
const data = {
id: user.id,
is_active: user.is_active
is_active: user.is_active,
};
this.$store
@ -283,9 +278,8 @@ export default {
this.showResetPasswordModal = false;
},
reset2FA(user) {
const data = {
id: user.id
id: user.id,
};
this.$store
@ -296,15 +290,15 @@ export default {
.catch(error => {
this.$q.notify(notifyErrorConfig("An Error occured while resetting key"));
});
}
},
},
computed: {
...mapState({
users: state => state.admin.users
})
users: state => state.admin.users,
}),
},
mounted() {
this.refresh();
}
},
};
</script>

6
web/src/store/admin.js
View File

@ -25,16 +25,16 @@ export default {
})
},
loadUser(context, pk) {
return axios.get(`/accounts/users/${pk}/`);
return axios.get(`/accounts/${pk}/users/`);
},
addUser(context, data) {
return axios.post("/accounts/users/", data);
},
editUser(context, data) {
return axios.put(`/accounts/users/${data.id}/`, data);
return axios.put(`/accounts/${data.id}/users/`, data);
},
deleteUser(context, pk) {
return axios.delete(`/accounts/users/${pk}/`).then(r => {
return axios.delete(`/accounts/${pk}/users/`).then(r => {
context.dispatch("loadUsers");
});
},