#132 | #121: backoffice / dev-1.0-121 #131

Merged
thomas merged 151 commits from dev-1.0-121 into develop-1.0 2024-04-28 20:02:14 +00:00
7 changed files with 16 additions and 17 deletions
Showing only changes of commit ae176dc623 - Show all commits

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6,7 +6,7 @@
<a-group-users v-if="item" ref="group-users"
:url="'{% url 'api:usergroup-list' %}?group=' + item.id"
commit-url="{% url 'api:usergroup-commit' %}"
:search-url="'{% url 'api:user-autocomplete' %}?search=${query}&group=' + item.id"
:search-url="'{% url 'api:user-autocomplete' %}?search=${query}&amp;not_in_group=' + item.id"
:initials="{group_id: item.id }"
/>
</template>

View File

@ -15,10 +15,10 @@
</thead>
<tbody>
<template v-for="item of items" :key="item.id">
<tr>
<tr :class="[item.created && 'has-text-info', item.deleted && 'has-text-danger']">
<td>
<b class="mr-3">{{ item.data.user.username }}</b>
<span class="text-light">{{ item.data.user.first_name }} {{ item.data.user.last_name }}</span>
<span>{{ item.data.user.first_name }} {{ item.data.user.last_name }}</span>
</td>
<td class="align-center">
<input type="checkbox" class="checkbox" @change="item.deleted = $event.target.checked">

View File

@ -41,9 +41,8 @@ export default class Model {
this.commit(data);
}
get errors() {
return this.data && this.data.__errors__
}
get created() { return !this.id }
get errors() { return this.data && this.data.__errors__ }
/**
* Get instance id from its data