paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2026-02-11 23:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Consistently version_label not label

Browse Source
This commit is contained in:
shamoon
2026-02-10 20:51:54 -08:00
parent ddbf9982a5
commit e0a1688be8
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-ui/src/app/components/document-detail/document-detail.component.html
View File

@@ -76,8 +76,8 @@
</span> </span>
<button type="button" class="version-entry flex-grow-1 ms-3 small text-start" (click)="selectVersion(version.id)"> <button type="button" class="version-entry flex-grow-1 ms-3 small text-start" (click)="selectVersion(version.id)">
<div class="small"> <div class="small">
@if (version.label) { @if (version.version_label) {
{{ version.label }} {{ version.version_label }}
} @else { } @else {
<span i18n>ID</span> #{{version.id}} <span i18n>ID</span> #{{version.id}}
} }

4
src-ui/src/app/components/document-detail/document-detail.component.spec.ts
View File

@@ -393,14 +393,14 @@ describe('DocumentDetailComponent', () => {
{ {
id: doc.id, id: doc.id,
added: new Date('2024-01-01T00:00:00Z'), added: new Date('2024-01-01T00:00:00Z'),
label: 'Original', version_label: 'Original',
checksum: 'aaaa', checksum: 'aaaa',
is_root: true, is_root: true,
}, },
{ {
id: 10, id: 10,
added: new Date('2024-01-02T00:00:00Z'), added: new Date('2024-01-02T00:00:00Z'),
label: 'Edited', version_label: 'Edited',
checksum: 'bbbb', checksum: 'bbbb',
is_root: false, is_root: false,
}, },

2
src-ui/src/app/data/document.ts
View File

@@ -172,7 +172,7 @@ export interface Document extends ObjectWithPermissions {
export interface DocumentVersionInfo { export interface DocumentVersionInfo {
id: number id: number
added?: Date added?: Date
label?: string version_label?: string
checksum?: string checksum?: string
is_root: boolean is_root: boolean
} }

2
src-ui/src/app/services/rest/document.service.spec.ts
View File

@@ -328,7 +328,7 @@ describe(`DocumentService`, () => {
expect(req.request.body).toBeInstanceOf(FormData) expect(req.request.body).toBeInstanceOf(FormData)
const body = req.request.body as FormData const body = req.request.body as FormData
expect(body.get('label')).toEqual('Label') expect(body.get('version_label')).toEqual('Label')
expect(body.get('document')).toBeInstanceOf(File) expect(body.get('document')).toBeInstanceOf(File)
req.flush('task-id') req.flush('task-id')

6
src-ui/src/app/services/rest/document.service.ts
View File

@@ -191,11 +191,11 @@ export class DocumentService extends AbstractPaperlessService<Document> {
return url return url
} }
uploadVersion(documentId: number, file: File, label?: string) { uploadVersion(documentId: number, file: File, versionLabel?: string) {
const formData = new FormData() const formData = new FormData()
formData.append('document', file, file.name) formData.append('document', file, file.name)
if (label) { if (versionLabel) {
formData.append('label', label) formData.append('version_label', versionLabel)
} }
return this.http.post<string>( return this.http.post<string>(
this.getResourceUrl(documentId, 'update_version'), this.getResourceUrl(documentId, 'update_version'),

6
src/documents/serialisers.py
View File

@@ -1066,7 +1066,7 @@ class DuplicateDocumentSummarySerializer(serializers.Serializer):
class DocumentVersionInfoSerializer(serializers.Serializer): class DocumentVersionInfoSerializer(serializers.Serializer):
id = serializers.IntegerField() id = serializers.IntegerField()
added = serializers.DateTimeField() added = serializers.DateTimeField()
label = serializers.CharField(required=False, allow_null=True) version_label = serializers.CharField(required=False, allow_null=True)
checksum = serializers.CharField(required=False, allow_null=True) checksum = serializers.CharField(required=False, allow_null=True)
is_root = serializers.BooleanField() is_root = serializers.BooleanField()
@@ -1141,7 +1141,7 @@ class DocumentSerializer(
return { return {
"id": doc.id, "id": doc.id,
"added": doc.added, "added": doc.added,
"label": doc.version_label, "version_label": doc.version_label,
"checksum": doc.checksum, "checksum": doc.checksum,
"is_root": doc.id == root_doc.id, "is_root": doc.id == root_doc.id,
} }
@@ -2039,7 +2039,7 @@ class DocumentVersionSerializer(serializers.Serializer):
label="Document", label="Document",
write_only=True, write_only=True,
) )
label = serializers.CharField( version_label = serializers.CharField(
label="Version label", label="Version label",
required=False, required=False,
allow_blank=True, allow_blank=True,

6
src/documents/views.py
View File

@@ -1528,7 +1528,7 @@ class DocumentViewSet(
try: try:
doc_name, doc_data = serializer.validated_data.get("document") doc_name, doc_data = serializer.validated_data.get("document")
label = serializer.validated_data.get("label") version_label = serializer.validated_data.get("version_label")
t = int(mktime(datetime.now().timetuple())) t = int(mktime(datetime.now().timetuple()))
@@ -1549,8 +1549,8 @@ class DocumentViewSet(
) )
overrides = DocumentMetadataOverrides() overrides = DocumentMetadataOverrides()
if label: if version_label:
overrides.version_label = label.strip() overrides.version_label = version_label.strip()
if request.user is not None: if request.user is not None:
overrides.actor_id = request.user.id overrides.actor_id = request.user.id