From f2ea113c7c36fddb5293272506064c0df37b587a Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 10 Mar 2020 12:46:22 +0100
Subject: [PATCH] FEAT #13405 TIME 0:15 Get admin shortcuts numbers
---
.../xml/documentEditorsConfig.xml | 2 +-
.../home/administration.component.ts | 24 ++++++++++---------
.../app/viewer/document-viewer.component.ts | 4 +---
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/apps/maarch_entreprise/xml/documentEditorsConfig.xml b/apps/maarch_entreprise/xml/documentEditorsConfig.xml
index 3d625f1c741..258e210a05b 100644
--- a/apps/maarch_entreprise/xml/documentEditorsConfig.xml
+++ b/apps/maarch_entreprise/xml/documentEditorsConfig.xml
@@ -5,7 +5,7 @@
</java>
<onlyoffice>
<enabled>true</enabled>
- <server_uri>onlyoffice.maarchcourrier.com</server_uri>
+ <server_uri>onlyoffice.local.maarch</server_uri>
<server_port>80</server_port>
<server_ssl>false</server_ssl>
</onlyoffice>
diff --git a/src/frontend/app/administration/home/administration.component.ts b/src/frontend/app/administration/home/administration.component.ts
index 9bca2acc3cd..859346ac3ec 100644
--- a/src/frontend/app/administration/home/administration.component.ts
+++ b/src/frontend/app/administration/home/administration.component.ts
@@ -11,6 +11,7 @@ import { FormControl } from '@angular/forms';
import { startWith, map, tap, catchError, exhaustMap } from 'rxjs/operators';
import { LatinisePipe } from 'ngx-pipes';
import { NotificationService } from '../../notification.service';
+import {FunctionsService} from "../../../service/functions.service";
@Component({
templateUrl: "administration.component.html",
@@ -43,7 +44,8 @@ export class AdministrationComponent implements OnInit {
public appService: AppService,
private privilegeService: PrivilegeService,
private latinisePipe: LatinisePipe,
- private notify: NotificationService) { }
+ private notify: NotificationService,
+ private functionService: FunctionsService) { }
ngOnInit(): void {
this.headerService.setHeader(this.lang.administration);
@@ -97,17 +99,17 @@ export class AdministrationComponent implements OnInit {
}
getNbShortcuts() {
- this.http.get('../../rest/users').pipe(
+ this.http.get('../../rest/administration/details').pipe(
tap((data: any) => {
- this.shortcutsAdmin.filter(admin => admin.id === 'admin_users')[0].count = data.users.length;
- }),
- exhaustMap(() => this.http.get('../../rest/groups')),
- tap((data: any) => {
- this.shortcutsAdmin.filter(admin => admin.id === 'admin_groups')[0].count = data.groups.length;
- }),
- exhaustMap(() => this.http.get('../../rest/entities')),
- tap((data: any) => {
- this.shortcutsAdmin.filter(admin => admin.id === 'manage_entities')[0].count = data.entities.length;
+ if (!this.functionService.empty(data.count.users)) {
+ this.shortcutsAdmin.filter(admin => admin.id === 'admin_users')[0].count = data.count.users;
+ }
+ if (!this.functionService.empty(data.count.groups)) {
+ this.shortcutsAdmin.filter(admin => admin.id === 'admin_groups')[0].count = data.count.groups;
+ }
+ if (!this.functionService.empty(data.count.entities)) {
+ this.shortcutsAdmin.filter(admin => admin.id === 'manage_entities')[0].count = data.count.entities;
+ }
}),
catchError((err: any) => {
this.notify.handleSoftErrors(err);
diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts
index ce34deb09ea..9ea013ba9fa 100644
--- a/src/frontend/app/viewer/document-viewer.component.ts
+++ b/src/frontend/app/viewer/document-viewer.component.ts
@@ -433,9 +433,7 @@ export class DocumentViewerComponent implements OnInit {
const objFile = JSON.parse(JSON.stringify(this.file));
objFile.content = objFile.contentMode === 'route' ? null : objFile.content;
- const myObservable = of(objFile);
-
- return myObservable;
+ return of(objFile);
}
}
--
GitLab