paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'shamoon/fix/issue-603' into fix/issue-603

Browse Source
This commit is contained in:
jonaswinkler 2021-02-27 11:13:21 +01:00
commit 5f6a202d65
2 changed files with 11 additions and 3 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.scss
View File

@ -79,6 +79,14 @@
right: .4rem; right: .4rem;
width: 1.8rem; width: 1.8rem;
height: 100%; height: 100%;
svg {
opacity: 0.5;
}
&:hover svg {
opacity: 1;
}
} }
.nav-link-additional { .nav-link-additional {

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

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms'; import { FormControl } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router, Params } from '@angular/router';
import { from, Observable, Subscription } from 'rxjs'; import { from, Observable, Subscription, BehaviorSubject } from 'rxjs';
import { debounceTime, distinctUntilChanged, map, switchMap } from 'rxjs/operators'; import { debounceTime, distinctUntilChanged, map, switchMap } from 'rxjs/operators';
import { PaperlessDocument } from 'src/app/data/paperless-document'; import { PaperlessDocument } from 'src/app/data/paperless-document';
import { OpenDocumentsService } from 'src/app/services/open-documents.service'; import { OpenDocumentsService } from 'src/app/services/open-documents.service';
@ -86,7 +86,7 @@ export class AppFrameComponent implements OnInit {
while (route.firstChild) { while (route.firstChild) {
route = route.firstChild route = route.firstChild
} }
if (route.component == DocumentDetailComponent) { if (route.component == DocumentDetailComponent && (route.params as BehaviorSubject<Params>).getValue()['id'] == d.id) {
this.router.navigate([""]) this.router.navigate([""])
} }
} }