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

Remove legacy sharing from frontend

Browse Source
This commit is contained in:
Max Berger
2026-03-28 09:36:29 +01:00
parent 5ab80a8779
commit 69a6a61ef8
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/sharing/__init__.py
View File

@@ -16,11 +16,9 @@
# along with Radicale. If not, see <http://www.gnu.org/licenses/>. # along with Radicale. If not, see <http://www.gnu.org/licenses/>.
import base64 import base64
import copy # TODO: remove/3.7.0-final
import io import io
import json import json
import logging import logging
import os # TODO: remove/3.7.0-final
import re import re
import socket import socket
import uuid import uuid

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

@@ -183,8 +183,7 @@ export class CollectionsScene {
let share_info = get_element(node, "[data-name=shared-by]"); let share_info = get_element(node, "[data-name=shared-by]");
let transformed_from = get_element(node, "[data-name=transformed-from]"); let transformed_from = get_element(node, "[data-name=transformed-from]");
let share = (shares || []).find( let share = (shares || []).find(
// TODO: Eventually remove the check for "bday" s => (s.ShareType === "map") &&
s => (s.ShareType === "map" || s.ShareType === "bday") &&
(s.PathOrToken || "").replace(/\/+$/, "") === (collection.href || "").replace(/\/+$/, "")); (s.PathOrToken || "").replace(/\/+$/, "") === (collection.href || "").replace(/\/+$/, ""));
if (share) { if (share) {
if (share.Owner !== user) { if (share.Owner !== user) {

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

@@ -99,8 +99,7 @@ export class IncomingSharingScene {
let prefix = "/" + user + "/"; let prefix = "/" + user + "/";
let filtered_shares = shares.filter( let filtered_shares = shares.filter(
// TODO: Eventually remove bday share => (share.ShareType === "map")
share => (share.ShareType === "map" || share.ShareType === "bday")
&& share.PathOrToken.startsWith(prefix)); && share.PathOrToken.startsWith(prefix));
if (filtered_shares.length === 0) { if (filtered_shares.length === 0) {

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

@@ -225,8 +225,7 @@ function add_share_rows(user, password, collection, shares, errorHandler) {
if (share["ShareType"] === "token") { if (share["ShareType"] === "token") {
add_share_row_node(user, password, collection, share, token_template, "share", delete_share_by_token, errorHandler); add_share_row_node(user, password, collection, share, token_template, "share", delete_share_by_token, errorHandler);
} }
// TODO: Eventually remove bday else if (share["ShareType"] === "map") {
else if (share["ShareType"] === "map" || share["ShareType"] === "bday") {
add_share_row_node(user, password, collection, share, map_template, "map", delete_share_by_map, errorHandler); add_share_row_node(user, password, collection, share, map_template, "map", delete_share_by_map, errorHandler);
} }
} }