mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Allow setting mailrule order from frontend
This commit is contained in:
		| @@ -13,6 +13,7 @@ | ||||
|         <app-input-number i18n-title title="Maximum age (days)" formControlName="maximum_age" [showAdd]="false" [error]="error?.maximum_age"></app-input-number> | ||||
|         <app-input-select i18n-title title="Attachment type" [items]="attachmentTypeOptions" formControlName="attachment_type"></app-input-select> | ||||
|         <app-input-select i18n-title title="Consumption scope" [items]="consumptionScopeOptions" formControlName="consumption_scope" i18n-hint hint="See docs for .eml processing requirements"></app-input-select> | ||||
|         <app-input-number i18n-title title="Rule order" formControlName="order" [showAdd]="false" [error]="error?.order"></app-input-number> | ||||
|       </div> | ||||
|       <div class="col"> | ||||
|         <p class="small" i18n>Paperless will only process mails that match <em>all</em> of the filters specified below.</p> | ||||
|   | ||||
| @@ -153,6 +153,7 @@ export class MailRuleEditDialogComponent extends EditDialogComponent<PaperlessMa | ||||
|       maximum_age: new FormControl(null), | ||||
|       attachment_type: new FormControl(MailFilterAttachmentType.Attachments), | ||||
|       consumption_scope: new FormControl(MailRuleConsumptionScope.Attachments), | ||||
|       order: new FormControl(null), | ||||
|       action: new FormControl(MailAction.MarkRead), | ||||
|       action_parameter: new FormControl(null), | ||||
|       assign_title_from: new FormControl(MailMetadataTitleOption.FromSubject), | ||||
|   | ||||
| @@ -36,6 +36,8 @@ export interface PaperlessMailRule extends ObjectWithId { | ||||
|  | ||||
|   account: number // PaperlessMailAccount.id | ||||
|  | ||||
|   order: number | ||||
|  | ||||
|   folder: string | ||||
|  | ||||
|   filter_from: string | ||||
|   | ||||
| @@ -27,7 +27,7 @@ class MailAccountViewSet(ModelViewSet): | ||||
| class MailRuleViewSet(ModelViewSet): | ||||
|     model = MailRule | ||||
|  | ||||
|     queryset = MailRule.objects.all().order_by("pk") | ||||
|     queryset = MailRule.objects.all().order_by("order") | ||||
|     serializer_class = MailRuleSerializer | ||||
|     pagination_class = StandardPagination | ||||
|     permission_classes = (IsAuthenticated,) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Michael Shamoon
					Michael Shamoon