xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

Removing duplicated '/' in sharing links. fixes #593

Browse Source
This commit is contained in:
Patrik J. Braun 2023-02-21 10:24:04 +01:00
parent a35c4e5bda
commit b793e48d70
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frontend/app/ui/gallery/share/share.gallery.component.ts
View File

@ -1,14 +1,14 @@
import { Component, OnDestroy, OnInit, TemplateRef } from '@angular/core';
import { Utils } from '../../../../../common/Utils';
import { ShareService } from '../share.service';
import { ContentService } from '../content.service';
import { ContentWrapper } from '../../../../../common/entities/ConentWrapper';
import { SharingDTO } from '../../../../../common/entities/SharingDTO';
import { Config } from '../../../../../common/config/public/Config';
import { NotificationService } from '../../../model/notification.service';
import { BsModalService } from 'ngx-bootstrap/modal';
import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service';
import { Subscription } from 'rxjs';
import {Component, OnDestroy, OnInit, TemplateRef} from '@angular/core';
import {Utils} from '../../../../../common/Utils';
import {ShareService} from '../share.service';
import {ContentService} from '../content.service';
import {ContentWrapper} from '../../../../../common/entities/ConentWrapper';
import {SharingDTO} from '../../../../../common/entities/SharingDTO';
import {Config} from '../../../../../common/config/public/Config';
import {NotificationService} from '../../../model/notification.service';
import {BsModalService} from 'ngx-bootstrap/modal';
import {BsModalRef} from 'ngx-bootstrap/modal/bs-modal-ref.service';
import {Subscription} from 'rxjs';
@Component({
selector: 'app-gallery-share',
@ -34,7 +34,7 @@ export class GalleryShareComponent implements OnInit, OnDestroy {
readonly ValidityTypes = ValidityTypes;
modalRef: BsModalRef;
invalidSettings = $localize`Invalid settings`
invalidSettings = $localize`Invalid settings`;
text = {
Yes: 'Yes',
@ -100,7 +100,7 @@ export class GalleryShareComponent implements OnInit, OnDestroy {
this.input.password,
this.calcValidity()
);
this.url = Config.Server.publicUrl + '/share/' + this.sharing.sharingKey;
this.url = Utils.concatUrls(Config.Server.publicUrl, '/share/', this.sharing.sharingKey);
}
async get(): Promise<void> {
@ -110,7 +110,7 @@ export class GalleryShareComponent implements OnInit, OnDestroy {
this.input.includeSubfolders,
this.calcValidity()
);
this.url = Config.Server.publicUrl + '/share/' + this.sharing.sharingKey;
this.url = Utils.concatUrls(Config.Server.publicUrl, '/share/', this.sharing.sharingKey);
}
async openModal(template: TemplateRef<unknown>): Promise<void> {