Merge pull request #2139 from bb2/patch-2

UI: Decode URL in text field for better readability

Author: pbiering

radicale/web/internal_data/js/scenes/CollectionsScene.js

@@ -124,7 +124,7 @@ export class CollectionsScene {
     _ondelete(collection) {
         try {
             let delete_collection_scene = new DeleteConfirmationScene(
-                this._user, this._password, "Delete Collection", collection, collection.displayname || collection.href,
+                this._user, this._password, "Delete Collection", collection, collection.displayname || decodeURIComponent(collection.href),
                 delete_collection, true
             );
             push_scene(delete_collection_scene);
@@ -253,7 +253,7 @@ export class CollectionsScene {
                 edit_btn.classList.add("hidden");
             }
         }
-        title_form.textContent = collection.displayname || collection.href;
+        title_form.textContent = collection.displayname || decodeURIComponent(collection.href);
         if (title_form.textContent.length > 30) {
             title_form.classList.add("smalltext");
         }

radicale/web/internal_data/js/scenes/CreateEditCollectionScene.js

@@ -196,7 +196,7 @@ export class CreateEditCollectionScene {
         this._remove_invalid_types();
         this._html_scene.classList.remove("hidden");
         if (this._edit && this._title_form) {
-            this._title_form.textContent = this._collection.displayname || this._collection.href;
+            this._title_form.textContent = this._collection.displayname || decodeURIComponent(this._collection.href);
         }
         this._fill_form();
         this._submit_btn.onclick = () => this._onsubmit();
@@ -230,4 +230,4 @@ export class CreateEditCollectionScene {
         return extract_title(this._collection);
     }
 
-}
+}