beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Library: Explicitly escape "#" characters in path names #3695

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-09-19 23:55:56 +02:00
parent 43655ba591
commit b65362b35a
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/dialog/photo/edit/files.vue
View file

@ -294,7 +294,10 @@ export default {
type: Object,
default: () => {},
},
uid: String,
uid: {
type: String,
default: "",
},
},
data() {
return {
@ -365,8 +368,11 @@ export default {
}
const name = m.Name;
const path = name.substring(0, name.lastIndexOf('/'));
// "#" chars in path names must be explicitly escaped,
// see https://github.com/photoprism/photoprism/issues/3695
const path = name.substring(0, name.lastIndexOf('/'))
.replaceAll(":", "%3A").replaceAll("#", "%23");
return this.$router.resolve({ path: '/index/files/' + path }).href;
},
downloadFile(file) {

5
frontend/src/model/folder.js
View file

@ -145,8 +145,9 @@ export class Folder extends RestModel {
path = "/" + path;
}
// Escape ":" in URL path.
path = path.replaceAll(":", "%3A");
// "#" chars in path names must be explicitly escaped,
// see https://github.com/photoprism/photoprism/issues/3695
path = path.replaceAll(":", "%3A").replaceAll("#", "%23");
return Api.get(this.getCollectionResource() + path, options).then((response) => {
let folders = response.data.folders ? response.data.folders : [];

5
frontend/src/page/library/browse.vue
View file

@ -217,7 +217,10 @@ export default {
// Open Edit Dialog
Event.publish("dialog.edit", {selection: [model.PhotoUID], album: null, index: 0});
} else {
this.$router.push({path: '/index/files/' + model.Path});
// "#" chars in path names must be explicitly escaped,
// see https://github.com/photoprism/photoprism/issues/3695
const path = model.Path.replaceAll(":", "%3A").replaceAll("#", "%23");
this.$router.push({path: '/index/files/' + path});
}
},
downloadFile(index) {