Compare commits

..

2 Commits

Author SHA1 Message Date
HardiReady 557d0de60a Fix log timestamp precision (CC-75) 2019-02-02 23:52:02 +01:00
HardiReady 8eb7d150ab simplify language selector 2019-02-02 23:15:27 +01:00
4 changed files with 5 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "opt-cc", "name": "opt-cc",
"version": "1.8.5", "version": "1.8.6",
"author": "Florian Hartwich <hardi@noarch.de>", "author": "Florian Hartwich <hardi@noarch.de>",
"private": true, "private": true,
"scripts": { "scripts": {

View File

@ -448,6 +448,7 @@ const getFullTimeDate = (date, timeString) => {
const time = timeString.split(':'); const time = timeString.split(':');
returnDate.setHours(time[0]); returnDate.setHours(time[0]);
returnDate.setMinutes(time[1]); returnDate.setMinutes(time[1]);
returnDate.setSeconds(time[2]);
return returnDate; return returnDate;
}; };

View File

@ -109,9 +109,8 @@
<a routerLink='{{config.loginPath}}' class="link">{{'navigation.top.login' | translate}}</a> <a routerLink='{{config.loginPath}}' class="link">{{'navigation.top.login' | translate}}</a>
</li> </li>
<li class="dropdown" *ngIf="features.localization"> <li class="dropdown" *ngIf="features.localization">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
aria-expanded="false" style="padding: 12px 12px 10px 12px;"> <span style="text-transform: uppercase;">{{language}}</span>
<mat-icon svgIcon="flag-{{language}}"></mat-icon>
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">

View File

@ -90,7 +90,7 @@ export class WarSubmitComponent {
error => { error => {
this.spinnerService.deactivate(); this.spinnerService.deactivate();
this.loading = false; this.loading = false;
const errorMsg = JSON.parse(error._body).error.message; const errorMsg = error._body ? JSON.parse(error._body).error.message : error.error.error.message;
this.snackBarService.showError('Error: '.concat(errorMsg), 15000); this.snackBarService.showError('Error: '.concat(errorMsg), 15000);
}); });
} }