Bonjour, une mise à jour de la forge logicielle est prévue mardi 02 Décembre 2021 de 08h à 9h. Celle-ci entrainera une interruption de service d'environ 1h de 8h à 9h. Cordialement, Maintenance forge logicielle

Commit 0ec40d97 authored by Dimitri DI GUSTO's avatar Dimitri DI GUSTO
Browse files

Merge branch 'SVP_DOS0056857' into 'master'

SVP DOS0056857

See merge request !83
parents aa90c724 8302cb84
Pipeline #7025 passed with stage
in 8 minutes and 44 seconds
{
"name": "webapp",
"version": "2.6.4",
"version": "2.6.5",
"license": "GNU Affero General Public License v3.0",
"scripts": {
"ng": "ng",
......
......@@ -151,7 +151,7 @@ export class InfoChartComponent implements OnInit {
}
if (value >= 1000) {
value = value / 1000;
return value.toLocaleString() + ' K';
return value.toLocaleString() + ' k';
}
return value.toLocaleString();
}
......
......@@ -54,11 +54,12 @@
class="greylightcolor" />
</svg>
<span *ngIf="summaryInfo.viewsNumber" i18n="@@dataset.info.viewsNumber">{{ summaryInfo.viewsNumber }}
view(s)during the last month</span>
<span *ngIf="!summaryInfo.viewsNumber">0</span>
&nbsp;
<span i18n="@@dataset.info.view">view</span>
<span *ngIf="summaryInfo.viewsNumber; else noView" i18n="@@dataset.info.viewsNumber">{{ summaryInfo.viewsNumber }}
view(s)during the last month
</span>
<ng-template #noView>
0&nbsp;<span i18n="@@dataset.info.view">view</span>
</ng-template>
</div>
<div>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
......@@ -70,4 +71,4 @@
<span>{{ summaryInfo.dataType }}</span>
</div>
</div>
</div>
\ No newline at end of file
</div>
......@@ -18,6 +18,7 @@
<div [class]="'item-grid' + ' item-grid-' + indexData"
[ngClass]="{'is-first': indexRow === 0, 'selected': element.id === selectedFeature, 'visited': isVisited(element.id) }"
*ngFor="let key of displayedProperties; let indexRow=index;" (click)="emitSelectedData(element)">
<ng-container *ngIf="!isPropertyComplex(element,key)">
<span *ngIf="!isUrl(element.properties[key]); else urlPropTemplate"
class="data-property-value">{{ element.properties[key] }}</span>
......@@ -27,7 +28,7 @@
</ng-template>
</ng-container>
<span *ngIf="isPropertyComplex(element,key)">
<span class="tooltip-right" i18n-data-tooltip="@@dataset.data.tooltip"
<span i18n-data-tooltip="@@dataset.data.tooltip"
data-tooltip="Complex property, please unfold the line">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="14" fill="none" viewBox="0 0 16 14">
<path fill="#fff"
......@@ -38,4 +39,4 @@
</span>
</div>
</ng-container>
</div>
\ No newline at end of file
</div>
......@@ -2,6 +2,7 @@ import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent } from '@angular/c
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { CookieService } from 'ngx-cookie-service';
import { APP_CONFIG } from '../../core/services/app-config.service';
@Injectable()
export class XSRFTokenInterceptor implements HttpInterceptor {
......@@ -16,9 +17,11 @@ export class XSRFTokenInterceptor implements HttpInterceptor {
let request = req;
if (xsrfToken) {
request = req.clone({
headers: req.headers.set('x-xsrf-token', xsrfToken),
});
if (!new RegExp(`^${APP_CONFIG.backendUrls.datasetUsageStatistics}`).test(req.url)) {
request = req.clone({
headers: req.headers.set('x-xsrf-token', xsrfToken),
});
}
}
return next.handle(request);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment