fix:create-document

This commit is contained in:
hungdztrau123
2024-05-31 09:08:28 +07:00
parent 0d76578906
commit 640d8b1c28
43 changed files with 470 additions and 208 deletions

View File

@@ -29,6 +29,7 @@ const documents = [
correspondent: 11,
document_type: 3,
storage_path: 8,
warehouse: 14,
},
{
id: 2,

View File

@@ -20,6 +20,7 @@ const documents = [
correspondent: 11,
document_type: 3,
storage_path: 8,
warehouse: 14,
},
{
id: 2,

View File

@@ -138,6 +138,7 @@ describe('PermissionsService', () => {
'view_savedview',
'view_uisettings',
'delete_storagepath',
'delete_warehouse',
'delete_frontendsettings',
'change_paperlesstask',
'view_taskresult',
@@ -185,6 +186,7 @@ describe('PermissionsService', () => {
'delete_document',
'change_uisettings',
'change_storagepath',
'change_warehouse',
'change_document',
'delete_tokenproxy',
'change_note',
@@ -210,6 +212,7 @@ describe('PermissionsService', () => {
'change_tag',
'change_chordcounter',
'add_storagepath',
'add_warehouse',
'delete_group',
'add_taskattributes',
'delete_mailaccount',
@@ -240,6 +243,7 @@ describe('PermissionsService', () => {
'delete_taskresult',
'view_contenttype',
'view_storagepath',
'view_warehouse',
'add_permission',
'change_userobjectpermission',
'delete_savedviewfilterrule',

View File

@@ -24,6 +24,7 @@ const documents = [
correspondent: 11,
document_type: 3,
storage_path: 8,
warehouse: 14,
},
{
id: 2,
@@ -225,6 +226,7 @@ describe(`DocumentService`, () => {
expect(doc.document_type$).not.toBeNull()
expect(doc.tags$).not.toBeNull()
expect(doc.storage_path$).not.toBeNull()
expect(doc.warehouse$).not.toBeNull()
})
httpTestingController
.expectOne(

View File

@@ -28,7 +28,7 @@ export const DOCUMENT_SORT_FIELDS = [
{ field: 'correspondent__name', name: $localize`Correspondent` },
{ field: 'title', name: $localize`Title` },
{ field: 'document_type__name', name: $localize`Document type` },
{ field: 'warehouses__name', name: $localize`Warehouse` },
{ field: 'warehouse__name', name: $localize`Warehouse` },
{ field: 'created', name: $localize`Created` },
{ field: 'added', name: $localize`Added` },
{ field: 'modified', name: $localize`Modified` },
@@ -123,13 +123,13 @@ export class DocumentService extends AbstractPaperlessService<Document> {
doc.storage_path$ = this.storagePathService.getCached(doc.storage_path)
}
if (
doc.warehouses &&
doc.warehouse &&
this.permissionsService.currentUserCan(
PermissionAction.View,
PermissionType.Warehouse
)
) {
doc.warehouses$ = this.warehouseService.getCached(doc.warehouses)
doc.warehouse$ = this.warehouseService.getCached(doc.warehouse)
}
return doc
}

View File

@@ -44,6 +44,7 @@ const group = {
'view_savedview',
'view_uisettings',
'delete_storagepath',
'delete_warehouse',
'delete_frontendsettings',
'change_paperlesstask',
'view_taskresult',
@@ -91,6 +92,7 @@ const group = {
'delete_document',
'change_uisettings',
'change_storagepath',
'change_warehouse',
'change_document',
'delete_tokenproxy',
'change_note',
@@ -116,6 +118,7 @@ const group = {
'change_tag',
'change_chordcounter',
'add_storagepath',
'add_warehouse',
'delete_group',
'add_taskattributes',
'delete_mailaccount',
@@ -146,6 +149,7 @@ const group = {
'delete_taskresult',
'view_contenttype',
'view_storagepath',
'view_warehouse',
'add_permission',
'change_userobjectpermission',
'delete_savedviewfilterrule',