Merge branch 'dev' into feature-permissions

This commit is contained in:
Michael Shamoon
2022-12-17 20:05:12 -08:00
41 changed files with 3562 additions and 1179 deletions

View File

@@ -5,7 +5,7 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'
templateUrl: './clearable-badge.component.html',
styleUrls: ['./clearable-badge.component.scss'],
})
export class ClearableBadge {
export class ClearableBadgeComponent {
constructor() {}
@Input()

View File

@@ -30,7 +30,7 @@ export abstract class EditDialogComponent<
object: T
@Output()
success = new EventEmitter()
succeeded = new EventEmitter()
networkActive = false
@@ -119,7 +119,7 @@ export abstract class EditDialogComponent<
serverResponse.subscribe({
next: (result) => {
this.activeModal.close()
this.success.emit(result)
this.succeeded.emit(result)
},
error: (error) => {
this.error = error.error

View File

@@ -6,7 +6,7 @@
</div>
<div class="modal-body">
<p *ngIf="this.dialogMode == 'edit'" i18n>
<p *ngIf="this.dialogMode === 'edit'" i18n>
<em>Note that editing a path does not apply changes to stored files until you have run the 'document_renamer' utility. See the <a target="_blank" href="https://docs.paperless-ngx.com/administration/#renamer">documentation</a>.</em>
</p>

View File

@@ -324,7 +324,7 @@ export class FilterableDropdownComponent {
apply = new EventEmitter<ChangedItems>()
@Output()
open = new EventEmitter()
opened = new EventEmitter()
get operatorToggleEnabled(): boolean {
return (
@@ -359,7 +359,7 @@ export class FilterableDropdownComponent {
if (this.editing) {
this.selectionModel.reset()
}
this.open.next(this)
this.opened.next(this)
} else {
this.filterText = ''
if (this.applyOnClose && this.selectionModel.isDirty()) {

View File

@@ -1,4 +1,4 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
import { Component, EventEmitter, Input, Output } from '@angular/core'
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
import { ObjectWithId } from 'src/app/data/object-with-id'
@@ -7,7 +7,7 @@ import { ObjectWithId } from 'src/app/data/object-with-id'
templateUrl: './select-dialog.component.html',
styleUrls: ['./select-dialog.component.scss'],
})
export class SelectDialogComponent implements OnInit {
export class SelectDialogComponent {
constructor(public activeModal: NgbActiveModal) {}
@Output()
@@ -24,8 +24,6 @@ export class SelectDialogComponent implements OnInit {
selected: number
ngOnInit(): void {}
cancelClicked() {
this.activeModal.close()
}

View File

@@ -1,4 +1,4 @@
import { Component, Input, OnInit } from '@angular/core'
import { Component, Input } from '@angular/core'
import { PaperlessTag } from 'src/app/data/paperless-tag'
@Component({
@@ -6,7 +6,7 @@ import { PaperlessTag } from 'src/app/data/paperless-tag'
templateUrl: './tag.component.html',
styleUrls: ['./tag.component.scss'],
})
export class TagComponent implements OnInit {
export class TagComponent {
constructor() {}
@Input()
@@ -17,6 +17,4 @@ export class TagComponent implements OnInit {
@Input()
clickable: boolean = false
ngOnInit(): void {}
}