1
0
mirror of https://github.com/bpatrik/pigallery2.git synced 2024-11-24 08:42:24 +02:00

Merge branch 'bpatrik:master' into gpx_wpt_mappoints

This commit is contained in:
zigmhount 2022-03-06 22:22:14 +01:00 committed by GitHub
commit 55c0e98df8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 217 additions and 216 deletions

View File

@ -59,8 +59,8 @@ export class ClientSharingConfig {
@SubConfigClass()
export class ClientRandomPhotoConfig {
@ConfigProperty({description: 'Enables random link generation. NOTE: With the current implementation, it poses a security risk. See https://github.com/bpatrik/pigallery2/issues/392'})
enabled: boolean = false;
@ConfigProperty({description: 'Enables random link generation.'})
enabled: boolean = true;
}
@SubConfigClass()

View File

@ -15,7 +15,7 @@ export class LanguageComponent {
current: string = null;
constructor(private cookieService: CookieService) {
this.languages = Config.Client.languages;
this.languages = Config.Client.languages.sort();
if (this.cookieService.get(CookieNames.lang) != null) {
this.current = this.cookieService.get(CookieNames.lang);
}

View File

@ -8,6 +8,7 @@
<app-settings-entry
name="Type"
[optionMap]="dbTypesMap"
[ngModel]="states.type"
i18n-name
required="true">

View File

@ -31,6 +31,14 @@ export class DatabaseSettingsComponent extends SettingsComponentDirective<Server
}
dbTypesMap = (v: { key: number, value: string }) => {
if (v.key === DatabaseType.sqlite) {
v.value += ' ' + $localize`(recommended)`;
} else if (v.value === DatabaseType[DatabaseType.memory]) {
v.value += ' ' + $localize`(deprecated, will be removed)`;
}
return v;
};
}

View File

@ -48,14 +48,6 @@ export class PhotoSettingsComponent extends SettingsComponentDirective<{
return this.jobsService.progress.value[JobDTOUtils.getHashName(DefaultsJobs[DefaultsJobs['Photo Converting']])];
}
libTypesMap = (v: { key: number, value: string }) => {
if (v.value.toLowerCase() === 'sharp') {
v.value += ' ' + $localize`(recommended)`;
} else {
v.value += ' ' + $localize`(deprecated, will be removed)`;
}
return v;
};
}

View File

@ -33,7 +33,7 @@
</ng-container>
<br/>
<ng-container i18n>
Note: With the current implementation, it poses a security risk. See:
Note: With the current implementation, random link also requires login. See:
</ng-container>
<a href="https://github.com/bpatrik/pigallery2/issues/392">#392</a>
</div>

File diff suppressed because it is too large Load Diff