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

UI: Remove leftover hardcodes for bday conversion

Browse Source
This commit is contained in:
Max Berger
2026-03-28 23:42:14 +01:00
parent e631734e6e
commit 9688db7e21
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ export class CreateEditShareScene {
this._map_validator.addValidator(this._shareuser_input, () => { this._map_validator.addValidator(this._shareuser_input, () => {
let conversion = this._get_selected_conversion(); let conversion = this._get_selected_conversion();
if (conversion === "bday") { if (conversion != "none") {
return validate_non_empty(this._shareuser_input, "Share User")(); return validate_non_empty(this._shareuser_input, "Share User")();
} else { } else {
return validate_not_empty_or_equals(this._shareuser_input, user, "Share User")(); return validate_not_empty_or_equals(this._shareuser_input, user, "Share User")();
@@ -105,9 +105,7 @@ export class CreateEditShareScene {
_on_conversion_change() { _on_conversion_change() {
let conversion = this._get_selected_conversion(); let conversion = this._get_selected_conversion();
if (conversion === "bday") { if (conversion != "none") {
this._permissions_ro_radio.checked = true;
this._permissions_rw_radio.checked = false;
this._permissions_ro_radio.disabled = true; this._permissions_ro_radio.disabled = true;
this._permissions_rw_radio.disabled = true; this._permissions_rw_radio.disabled = true;
this._enabled_checkbox.checked = true; this._enabled_checkbox.checked = true;
@@ -138,10 +136,10 @@ export class CreateEditShareScene {
} }
} }
let conversion = this._get_selected_conversion(); let conversion = this._get_selected_conversion();
let is_birthday = conversion === "bday"; let is_conversion = conversion != "none";
let enabled_by_owner = is_birthday ? true : this._enabled_checkbox.checked; let enabled_by_owner = is_conversion ? true : this._enabled_checkbox.checked;
let hidden_by_owner = is_birthday ? false : this._hidden_checkbox.checked; let hidden_by_owner = is_conversion ? false : this._hidden_checkbox.checked;
let permissions = is_birthday ? "r" : (this._permissions_rw_radio.checked ? "rw" : "r"); let permissions = is_conversion ? "r" : (this._permissions_rw_radio.checked ? "rw" : "r");
/** @type {string} */ let conversion_value = conversion; /** @type {string} */ let conversion_value = conversion;
/** @type {Object<string, string>} */ let properties = {}; /** @type {Object<string, string>} */ let properties = {};

2
radicale/web/internal_data/js/utils/permissions.js
View File

@@ -28,7 +28,7 @@ export function displayPermissionsOrConversion(conversion, permissions, node) {
const roElement = get_element(node, "[data-name=ro]"); const roElement = get_element(node, "[data-name=ro]");
const rwElement = get_element(node, "[data-name=rw]"); const rwElement = get_element(node, "[data-name=rw]");
let fixedConversion = (conversion || "").toLowerCase(); let fixedConversion = (conversion || "").toLowerCase();
if (fixedConversion === "bday") { if (fixedConversion != "none" && fixedConversion != "") {
conversionElement.classList.remove("hidden"); conversionElement.classList.remove("hidden");
roElement.classList.add("hidden"); roElement.classList.add("hidden");
rwElement.classList.add("hidden"); rwElement.classList.add("hidden");