Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

UI: Add support for usernames with @ symbol

Browse Source
This commit is contained in:
Max Berger
2026-04-25 21:21:10 +02:00
parent 146d4b4a9a
commit f1af26a798
8 changed files with 67 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/web/internal_data/js/scenes/CollectionsScene.js
View File

@@ -202,7 +202,7 @@ export class CollectionsScene {
let transformed_from = get_element(node, "[data-name=transformed-from]");
let share = (shares || []).find(
s => (s.ShareType === "map") &&
(s.PathOrToken || "").replace(/\/+$/, "") === (collection.href || "").replace(/\/+$/, ""));
decodeURIComponent(s.PathOrToken || "").replace(/\/+$/, "") === decodeURIComponent(collection.href || "").replace(/\/+$/, ""));
if (share) {
if (share.Owner !== this._user) {
share_info.classList.remove("hidden");

2
radicale/web/internal_data/js/scenes/CreateEditShareScene.js
View File

@@ -46,7 +46,7 @@ export class CreateEditShareScene {
this._shareType = shareType;
this._share = share;
this._edit = !!share;
this._pathMapped = collection.href;
this._pathMapped = decodeURIComponent(collection.href);
this._html_scene = get_element_by_id("createeditsharescene");
this._title = get_element(this._html_scene, "[data-name=title]");

4
radicale/web/internal_data/js/scenes/IncomingSharingScene.js
View File

@@ -97,10 +97,10 @@ export class IncomingSharingScene {
});
this._nodes = [];
let prefix = "/" + this._user + "/";
let prefix = "/" + decodeURIComponent(this._user) + "/";
let filtered_shares = shares.filter(
share => (share.ShareType === "map")
&& share.PathOrToken.startsWith(prefix));
&& decodeURIComponent(share.PathOrToken).startsWith(prefix));
if (filtered_shares.length === 0) {
this._table.classList.add("hidden");

8
radicale/web/internal_data/js/scenes/ShareCollectionScene.js
View File

@@ -226,9 +226,13 @@ function add_share_rows(user, password, collection, shares, errorHandler) {
shares.forEach(function (share) {
let pathortoken = share["PathOrToken"] || "";
let pathmapped = share["PathMapped"] || "";
let decodedHref = decodeURIComponent(collection.href).replace(/\/+$/, "") + "/";
let decodedPathMapped = decodeURIComponent(pathmapped).replace(/\/+$/, "") + "/";
let decodedPathOrToken = decodeURIComponent(pathortoken).replace(/\/+$/, "") + "/";
if (
collection.href.includes(pathmapped) ||
collection.href.includes(pathortoken)
decodedHref.includes(decodedPathMapped) ||
decodedHref.includes(decodedPathOrToken)
) {
if (share["ShareType"] === "token") {
add_share_row_node(user, password, collection, share, token_template, "share", delete_share_by_token, errorHandler);