diff --git a/apps/maarch_entreprise/xml/documentEditorsConfig.xml b/apps/maarch_entreprise/xml/documentEditorsConfig.xml index 3d625f1c74168207b246ade74a6ae31fcc56f37d..258e210a05b6a39f4ce0456baf178afd54890008 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 9bca2acc3cdc1515e904e78eca70ed9535634018..859346ac3ec03eee8d917ba27b9ac8f7e5641d80 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 ce34deb09ea5e2b44cc554294da07cbd304c1245..9ea013ba9fa371731c91f223cdd40e61a71f7576 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); } }