From 5ada4f612e270030a61e73f3895c8f194a4488b9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 9 Apr 2021 16:11:20 +0200
Subject: [PATCH] Disable calendar passwords

---
 www/calendar/inner.js      | 1 +
 www/common/inner/access.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 89058d49a..4a576b6d3 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -424,6 +424,7 @@ Messages.calendar_dateTimeRange = "{0} {1} - {2}";
                         },
                         common: common,
                         noExpiration: true,
+                        noEditPassword: true,
                         channel: id,
                         href: href
                     });
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
index 2c4df6508..52b0d0319 100644
--- a/www/common/inner/access.js
+++ b/www/common/inner/access.js
@@ -842,7 +842,7 @@ define([
 
             // In the properties, we should have the edit href if we know it.
             // We should know it because the pad is stored, but it's better to check...
-            if (!data.noEditPassword && owned && data.href) { // FIXME SHEET fix password change for sheets
+            if (!data.noEditPassword && !opts.noEditPassword && owned && data.href) { // FIXME SHEET fix password change for sheets
                 var isOO = parsed.type === 'sheet';
                 var isFile = parsed.hashData.type === 'file';
                 var isSharedFolder = parsed.type === 'drive';
@@ -985,7 +985,7 @@ define([
                         if (err || (obj && obj.error)) { UI.warn(Messages.error); }
                     });
                 });
-                $d.append(h('br'));
+                if (!opts.noEditPassword) { $d.append(h('br')); }
                 $d.append(h('div', [
                     h('label', Messages.access_destroyPad),
                     h('br'),