Move everything to models and services #17

Merged
konrad merged 82 commits from refactor/models into master 2019-03-02 10:25:10 +00:00
Showing only changes of commit 88f1632af6 - Show all commits

View File

@ -9,13 +9,13 @@
<div class="card-content content users-list">
<form @submit.prevent="addUser()" class="add-user-form" v-if="userIsAdmin">
<div class="field is-grouped">
<p class="control is-expanded" v-bind:class="{ 'is-loading': loading}">
<p class="control is-expanded" v-bind:class="{ 'is-loading': userStuffService.loading}">
<multiselect
v-model="user"
:options="foundUsers"
:multiple="false"
:searchable="true"
:loading="loading"
:loading="userService.loading"
:internal-search="true"
@search-change="findUsers"
placeholder="Type to search a user"
@ -105,7 +105,6 @@
import multiselect from 'vue-multiselect'
import 'vue-multiselect/dist/vue-multiselect.min.css'
import UserService from '../../services/user'
//import UserModel from '../../models/user'
import UserNamespaceModel from '../../models/userNamespace'
import UserListModel from '../../models/userList'
import UserListService from '../../services/userList'
@ -126,12 +125,10 @@
userStuff: Object, // This will be either UserNamespaceModel or UserListModel
userStuffService: Object, // This will be either UserListService or UserNamespaceService
loading: false,
currentUser: auth.user.infos,
typeString: '',
showUserDeleteModal: false,
users: [],
userToDelete: 0,
foundUsers: [],
}
},
@ -217,10 +214,8 @@
})
},
findUsers(query) {
const cancel = message.setLoading(this)
if(query === '') {
this.$set(this, 'foundUsers', [])
cancel()
return
}