mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-28 03:46:06 -05:00 
			
		
		
		
	Merge branch 'dev' into feature-bulk-edit
This commit is contained in:
		| @@ -5,6 +5,7 @@ | |||||||
|       [disabled]="disabled" |       [disabled]="disabled" | ||||||
|       [style.color]="textColor" |       [style.color]="textColor" | ||||||
|       [style.background]="backgroundColor" |       [style.background]="backgroundColor" | ||||||
|  |       [clearable]="allowNull" | ||||||
|       (change)="onChange(value)" |       (change)="onChange(value)" | ||||||
|       (blur)="onTouched()"> |       (blur)="onTouched()"> | ||||||
|       <ng-option *ngFor="let i of items" [value]="i.id">{{i.name}}</ng-option> |       <ng-option *ngFor="let i of items" [value]="i.id">{{i.name}}</ng-option> | ||||||
|   | |||||||
| @@ -67,9 +67,9 @@ | |||||||
|                                 formControlName='archive_serial_number'> |                                 formControlName='archive_serial_number'> | ||||||
|                         </div> |                         </div> | ||||||
|                         <app-input-date-time titleDate="Date created" formControlName="created"></app-input-date-time> |                         <app-input-date-time titleDate="Date created" formControlName="created"></app-input-date-time> | ||||||
|                         <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent" |                         <app-input-select [items]="correspondents" title="Correspondent" formControlName="correspondent" [allowNull]="true" | ||||||
|                             (createNew)="createCorrespondent()"></app-input-select> |                             (createNew)="createCorrespondent()"></app-input-select> | ||||||
|                         <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type" |                         <app-input-select [items]="documentTypes" title="Document type" formControlName="document_type" [allowNull]="true" | ||||||
|                             (createNew)="createDocumentType()"></app-input-select> |                             (createNew)="createDocumentType()"></app-input-select> | ||||||
|                         <app-input-tags formControlName="tags" title="Tags"></app-input-tags> |                         <app-input-tags formControlName="tags" title="Tags"></app-input-tags> | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 jonaswinkler
					jonaswinkler