mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2026-02-11 23:59:31 -06:00
Consistently version_label not label
This commit is contained in:
@@ -76,8 +76,8 @@
|
||||
</span>
|
||||
<button type="button" class="version-entry flex-grow-1 ms-3 small text-start" (click)="selectVersion(version.id)">
|
||||
<div class="small">
|
||||
@if (version.label) {
|
||||
{{ version.label }}
|
||||
@if (version.version_label) {
|
||||
{{ version.version_label }}
|
||||
} @else {
|
||||
<span i18n>ID</span> #{{version.id}}
|
||||
}
|
||||
|
||||
@@ -393,14 +393,14 @@ describe('DocumentDetailComponent', () => {
|
||||
{
|
||||
id: doc.id,
|
||||
added: new Date('2024-01-01T00:00:00Z'),
|
||||
label: 'Original',
|
||||
version_label: 'Original',
|
||||
checksum: 'aaaa',
|
||||
is_root: true,
|
||||
},
|
||||
{
|
||||
id: 10,
|
||||
added: new Date('2024-01-02T00:00:00Z'),
|
||||
label: 'Edited',
|
||||
version_label: 'Edited',
|
||||
checksum: 'bbbb',
|
||||
is_root: false,
|
||||
},
|
||||
|
||||
@@ -172,7 +172,7 @@ export interface Document extends ObjectWithPermissions {
|
||||
export interface DocumentVersionInfo {
|
||||
id: number
|
||||
added?: Date
|
||||
label?: string
|
||||
version_label?: string
|
||||
checksum?: string
|
||||
is_root: boolean
|
||||
}
|
||||
|
||||
@@ -328,7 +328,7 @@ describe(`DocumentService`, () => {
|
||||
expect(req.request.body).toBeInstanceOf(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)
|
||||
|
||||
req.flush('task-id')
|
||||
|
||||
@@ -191,11 +191,11 @@ export class DocumentService extends AbstractPaperlessService<Document> {
|
||||
return url
|
||||
}
|
||||
|
||||
uploadVersion(documentId: number, file: File, label?: string) {
|
||||
uploadVersion(documentId: number, file: File, versionLabel?: string) {
|
||||
const formData = new FormData()
|
||||
formData.append('document', file, file.name)
|
||||
if (label) {
|
||||
formData.append('label', label)
|
||||
if (versionLabel) {
|
||||
formData.append('version_label', versionLabel)
|
||||
}
|
||||
return this.http.post<string>(
|
||||
this.getResourceUrl(documentId, 'update_version'),
|
||||
|
||||
@@ -1066,7 +1066,7 @@ class DuplicateDocumentSummarySerializer(serializers.Serializer):
|
||||
class DocumentVersionInfoSerializer(serializers.Serializer):
|
||||
id = serializers.IntegerField()
|
||||
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)
|
||||
is_root = serializers.BooleanField()
|
||||
|
||||
@@ -1141,7 +1141,7 @@ class DocumentSerializer(
|
||||
return {
|
||||
"id": doc.id,
|
||||
"added": doc.added,
|
||||
"label": doc.version_label,
|
||||
"version_label": doc.version_label,
|
||||
"checksum": doc.checksum,
|
||||
"is_root": doc.id == root_doc.id,
|
||||
}
|
||||
@@ -2039,7 +2039,7 @@ class DocumentVersionSerializer(serializers.Serializer):
|
||||
label="Document",
|
||||
write_only=True,
|
||||
)
|
||||
label = serializers.CharField(
|
||||
version_label = serializers.CharField(
|
||||
label="Version label",
|
||||
required=False,
|
||||
allow_blank=True,
|
||||
|
||||
@@ -1528,7 +1528,7 @@ class DocumentViewSet(
|
||||
|
||||
try:
|
||||
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()))
|
||||
|
||||
@@ -1549,8 +1549,8 @@ class DocumentViewSet(
|
||||
)
|
||||
|
||||
overrides = DocumentMetadataOverrides()
|
||||
if label:
|
||||
overrides.version_label = label.strip()
|
||||
if version_label:
|
||||
overrides.version_label = version_label.strip()
|
||||
if request.user is not None:
|
||||
overrides.actor_id = request.user.id
|
||||
|
||||
|
||||
Reference in New Issue
Block a user