lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix delete button not deleting documents

Browse Source 
Still can't delete folders
This commit is contained in:
Renato 2023-09-21 04:35:32 +08:00
parent 4194761b26
commit e8a849e6c1
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src-ui/src/app/components/app-frame/app-frame.component.ts
View File

@ -27,6 +27,7 @@ import { ComponentCanDeactivate } from 'src/app/guards/dirty-doc.guard'
import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
import { ToastService } from 'src/app/services/toast.service' import { ToastService } from 'src/app/services/toast.service'
import { ComponentWithPermissions } from '../with-permissions/with-permissions.component' import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
import { ExplorerListViewService } from 'src/app/services/explorer-list-view.service'
@Component({ @Component({
selector: 'app-app-frame', selector: 'app-app-frame',
@ -44,7 +45,8 @@ export class AppFrameComponent
private searchService: SearchService, private searchService: SearchService,
public savedViewService: SavedViewService, public savedViewService: SavedViewService,
private remoteVersionService: RemoteVersionService, private remoteVersionService: RemoteVersionService,
private list: DocumentListViewService, private documentList: DocumentListViewService,
private exploreList: ExplorerListViewService,
public settingsService: SettingsService, public settingsService: SettingsService,
public tasksService: TasksService, public tasksService: TasksService,
private readonly toastService: ToastService private readonly toastService: ToastService
@ -95,6 +97,8 @@ export class AppFrameComponent
closeMenu() { closeMenu() {
this.isMenuCollapsed = true this.isMenuCollapsed = true
this.documentList.selectNone()
this.exploreList.selectNone()
} }
get openDocuments(): PaperlessDocument[] { get openDocuments(): PaperlessDocument[] {
@ -153,7 +157,7 @@ export class AppFrameComponent
search() { search() {
this.closeMenu() this.closeMenu()
this.list.quickFilter([ this.documentList.quickFilter([
{ {
rule_type: FILTER_FULLTEXT_QUERY, rule_type: FILTER_FULLTEXT_QUERY,
value: (this.searchField.value as string).trim(), value: (this.searchField.value as string).trim(),

8
src-ui/src/app/components/explorer/explorer.component.ts
View File

@ -37,6 +37,7 @@ import { FolderCreateDialogComponent } from '../common/create-dialog/folder-crea
import { UploadLargeFileComponent } from '../common/create-dialog/upload-large-file/upload-large-file.component' import { UploadLargeFileComponent } from '../common/create-dialog/upload-large-file/upload-large-file.component'
import { ComponentWithPermissions } from '../with-permissions/with-permissions.component' import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
import { FilterEditorComponent } from './filter-editor/filter-editor.component' import { FilterEditorComponent } from './filter-editor/filter-editor.component'
import { DocumentListViewService } from 'src/app/services/document-list-view.service'
@Component({ @Component({
selector: 'app-explorer', selector: 'app-explorer',
@ -49,6 +50,7 @@ export class ExplorerComponent
{ {
constructor( constructor(
public list: ExplorerListViewService, public list: ExplorerListViewService,
public documentList: DocumentListViewService,
public savedViewService: SavedViewService, public savedViewService: SavedViewService,
public route: ActivatedRoute, public route: ActivatedRoute,
private router: Router, private router: Router,
@ -188,9 +190,7 @@ export class ExplorerComponent
.subscribe(() => this.list.reload()) .subscribe(() => this.list.reload())
} }
uploadFile() { uploadFile() {}
}
uploadLargeFile() { uploadLargeFile() {
var modal = this.modalService.open(UploadLargeFileComponent, { var modal = this.modalService.open(UploadLargeFileComponent, {
@ -212,6 +212,8 @@ export class ExplorerComponent
} }
toggleSelected(document: PaperlessDocument, event: MouseEvent): void { toggleSelected(document: PaperlessDocument, event: MouseEvent): void {
if (!event.shiftKey) this.documentList.toggleSelected(document)
else this.documentList.selectRangeTo(document)
if (!event.shiftKey) this.list.toggleSelected(document) if (!event.shiftKey) this.list.toggleSelected(document)
else this.list.selectRangeTo(document) else this.list.selectRangeTo(document)
} }