local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: sharing lists and namespaces

Browse source
This commit is contained in:
kolaente 2022-06-16 22:18:37 +02:00
parent 978cb9769e
commit fab58a2e6d
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/components/sharing/userTeam.vue
View file

@ -131,12 +131,12 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import {defineComponent, ShallowReactive, shallowReactive} from 'vue' import {defineComponent} from 'vue'
export default defineComponent({ name: 'userTeamShare' }) export default defineComponent({ name: 'userTeamShare' })
</script> </script>
<script setup lang="ts"> <script setup lang="ts">
import {ref, reactive, computed} from 'vue' import {ref, reactive, computed, shallowReactive, ShallowReactive, Ref} from 'vue'
import type {PropType} from 'vue' import type {PropType} from 'vue'
import {useStore} from 'vuex' import {useStore} from 'vuex'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
@ -185,7 +185,7 @@ const {t} = useI18n({useScope: 'global'})
let stuffService: ShallowReactive<UserNamespaceService | UserListService | TeamListService | TeamNamespaceService> let stuffService: ShallowReactive<UserNamespaceService | UserListService | TeamListService | TeamNamespaceService>
let stuffModel: UserNamespaceModel | UserListModel | TeamListModel | TeamNamespaceModel let stuffModel: UserNamespaceModel | UserListModel | TeamListModel | TeamNamespaceModel
let searchService: ShallowReactive<UserService | TeamService> let searchService: ShallowReactive<UserService | TeamService>
let sharable: UserModel | TeamModel let sharable: Ref<UserModel | TeamModel>
const searchLabel = ref('') const searchLabel = ref('')
const selectedRight = ref({}) const selectedRight = ref({})
@ -230,7 +230,7 @@ const sharableName = computed(() => {
if (props.shareType === 'user') { if (props.shareType === 'user') {
searchService = shallowReactive(new UserService()) searchService = shallowReactive(new UserService())
sharable = reactive(new UserModel()) sharable = ref(new UserModel())
searchLabel.value = 'username' searchLabel.value = 'username'
if (props.type === 'list') { if (props.type === 'list') {
@ -246,7 +246,7 @@ if (props.shareType === 'user') {
} }
} else if (props.shareType === 'team') { } else if (props.shareType === 'team') {
searchService = new TeamService() searchService = new TeamService()
sharable = reactive(new TeamModel()) sharable = ref(new TeamModel())
searchLabel.value = 'name' searchLabel.value = 'name'
if (props.type === 'list') { if (props.type === 'list') {
@ -275,9 +275,9 @@ async function load() {
async function deleteSharable() { async function deleteSharable() {
if (props.shareType === 'user') { if (props.shareType === 'user') {
stuffModel.userId = sharable.username stuffModel.userId = sharable.value.username
} else if (props.shareType === 'team') { } else if (props.shareType === 'team') {
stuffModel.teamId = sharable.id stuffModel.teamId = sharable.value.id
} }
await stuffService.delete(stuffModel) await stuffService.delete(stuffModel)
@ -306,11 +306,11 @@ async function add(admin) {
} }
if (props.shareType === 'user') { if (props.shareType === 'user') {
stuffModel.userId = sharable.username stuffModel.userId = sharable.value.username
} else if (props.shareType === 'team') { } else if (props.shareType === 'team') {
stuffModel.teamId = sharable.id stuffModel.teamId = sharable.value.id
} }
await stuffService.create(stuffModel) await stuffService.create(stuffModel)
success({message: t('list.share.userTeam.addedSuccess', {type: shareTypeName.value})}) success({message: t('list.share.userTeam.addedSuccess', {type: shareTypeName.value})})
await load() await load()