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

sharing/legacy bday: fallback for list

Browse Source
This commit is contained in:
Peter Bieringer
2026-03-25 06:55:56 +01:00
parent 0dab5ffcf8
commit a923ccf2d3
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
radicale/sharing/__init__.py
View File

@@ -16,6 +16,7 @@
# 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
@@ -878,6 +879,14 @@ class BaseSharing:
Conversion=Conversion, Conversion=Conversion,
) )
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final
# check and change to legacy ShareType # TODO: remove/3.7.0-final
result_array_adj = copy.deepcopy(result_array) # TODO: remove/3.7.0-final
for index in range(0, len(result_array_adj)): # TODO: remove/3.7.0-final
if result_array_adj[index]['Conversion'] == "bday": # TODO: remove/3.7.0-final
result_array_adj[index]['ShareType'] = "bday" # TODO: remove/3.7.0-final
result_array = result_array_adj
answer['Lines'] = len(result_array) answer['Lines'] = len(result_array)
if len(result_array) == 0: if len(result_array) == 0:
answer['Status'] = "not-found" answer['Status'] = "not-found"

14
radicale/tests/test_sharing.py
View File

@@ -4351,6 +4351,20 @@ permissions: RrWw""")
json_dict['PathOrToken'] = path_shared_r json_dict['PathOrToken'] = path_shared_r
_, headers, answer = self._sharing_api_json("map", "enable", check=200, login="user:userpw", json_dict=json_dict) _, headers, answer = self._sharing_api_json("map", "enable", check=200, login="user:userpw", json_dict=json_dict)
# list by user
logging.info("\n*** list by user")
json_dict = {}
_, headers, answer = self._sharing_api_json("map", "list", check=200, login="user:userpw", json_dict=json_dict)
answer_dict = json.loads(answer)
assert answer_dict['Status'] == "success"
assert answer_dict['Lines'] == 1
row = answer_dict['Content'][0]
if "SHARING_NO_LEGACY" not in os.environ: # TODO: remove/3.7.0-final
assert row['ShareType'] == "bday" # TODO: remove/3.7.0-final
else: # TODO: remove/3.7.0-final
assert row['ShareType'] == "map"
assert row['Conversion'] == "bday"
# check PROPFIND item as user # check PROPFIND item as user
logging.info("\n*** PROPFIND item as user -> calendar") logging.info("\n*** PROPFIND item as user -> calendar")
response = self._propfind_allprop(path_shared_r, login="user:userpw") response = self._propfind_allprop(path_shared_r, login="user:userpw")