Compare commits
1 Commits
d6c2f94541
...
3df37fb093
Author | SHA1 | Date | |
---|---|---|---|
3df37fb093 |
|
@ -98,7 +98,7 @@
|
|||
<script lang="ts">
|
||||
import {defineComponent, type PropType} from 'vue'
|
||||
|
||||
import TaskModel from '../../../models/task'
|
||||
import TaskModel from '@/models/task'
|
||||
import type {ITask} from '@/modelTypes/ITask'
|
||||
import PriorityLabel from './priorityLabel.vue'
|
||||
import TaskService from '../../../services/task'
|
||||
|
|
|
@ -14,13 +14,10 @@ export default class AttachmentModel extends AbstractModel<IAttachment> implemen
|
|||
|
||||
constructor(data: Partial<IAttachment>) {
|
||||
super()
|
||||
this.assignData(data, (data) => {
|
||||
return {
|
||||
...data,
|
||||
createdBy: new UserModel(data.createdBy),
|
||||
file: new FileModel(data.file),
|
||||
created: new Date(data.created),
|
||||
}
|
||||
})
|
||||
this.assignData(data)
|
||||
|
||||
this.createdBy = new UserModel(this.createdBy)
|
||||
this.file = new FileModel(this.file)
|
||||
this.created = new Date(this.created)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,17 +21,12 @@ export default class BucketModel extends AbstractModel<IBucket> implements IBuck
|
|||
|
||||
constructor(data: Partial<IBucket>) {
|
||||
super()
|
||||
this.assignData(data, (data) => {
|
||||
return {
|
||||
...data,
|
||||
tasks: data.tasks.map(t => new TaskModel(t)),
|
||||
|
||||
createdBy: new UserModel(data.createdBy),
|
||||
created: new Date(data.created),
|
||||
updated: new Date(data.updated),
|
||||
}
|
||||
})
|
||||
this.assignData(data)
|
||||
|
||||
this.tasks = this.tasks.map(t => new TaskModel(t))
|
||||
|
||||
this.createdBy = new UserModel(this.createdBy)
|
||||
this.created = new Date(this.created)
|
||||
this.updated = new Date(this.updated)
|
||||
}
|
||||
}
|
|
@ -8,13 +8,10 @@ export default class CaldavTokenModel extends AbstractModel<ICaldavToken> implem
|
|||
|
||||
constructor(data: Partial<CaldavTokenModel>) {
|
||||
super()
|
||||
this.assignData(data, (data) => {
|
||||
|
||||
return {
|
||||
...data,
|
||||
...data?.created && new Date(this.created),
|
||||
}
|
||||
})
|
||||
this.assignData(data)
|
||||
|
||||
if (this.created) {
|
||||
this.created = new Date(this.created)
|
||||
}
|
||||
}
|
||||
}
|
|
@ -278,10 +278,8 @@ export default abstract class AbstractService<Model extends IAbstract = IAbstrac
|
|||
|
||||
try {
|
||||
const response = await this.http.get(finalUrl, {params: prepareParams(params)})
|
||||
const result = this.modelGetFactory({
|
||||
...response.data,
|
||||
maxRight: Number(response.headers['x-max-right']) as Right,
|
||||
})
|
||||
const result = this.modelGetFactory(response.data)
|
||||
result.maxRight = Number(response.headers['x-max-right']) as Right
|
||||
return result
|
||||
} finally {
|
||||
cancel()
|
||||
|
|
|
@ -18,10 +18,8 @@ export default class AttachmentService extends AbstractService<AttachmentModel>
|
|||
}
|
||||
|
||||
processModel(model: IAttachment) {
|
||||
return {
|
||||
...model,
|
||||
created: formatISO(new Date(model.created)),
|
||||
}
|
||||
model.created = formatISO(new Date(model.created))
|
||||
return model
|
||||
}
|
||||
|
||||
useCreateInterceptor() {
|
||||
|
|
Reference in New Issue
Block a user