Merge pull request #1680 from cryptpad/requestedit_button

'Request edit' button
cryptpad · Dec 12, 2024 · 4c0b2d2 · 4c0b2d2
2 parents 48eabac + 650bb23
commit 4c0b2d2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/www/common/inner/access.js b/www/common/inner/access.js
@@ -1108,7 +1108,7 @@ define([
             var owned = Modal.isOwned(Env, data);
 
             // Request edit access
-            if (common.isLoggedIn() && data.roHref && !owned && !opts.calendar && priv.app !== 'form') {
+            if (common.isLoggedIn() && data.roHref && !owned && !opts.calendar && priv.app !== 'form' && !data.href) {
                 var requestButton = h('button.btn.btn-secondary.no-margin.cp-access-margin-right',
                                         Messages.requestEdit_button);
                 var requestBlock = h('p', requestButton);

diff --git a/www/common/inner/common-modal.js b/www/common/inner/common-modal.js
@@ -49,7 +49,13 @@ define([
                         // Access modal and the pad is not stored: get the hashes from outer
                         var hashes = priv.hashes || {};
                         // For calendars, individual href is passed via opts
-                        data.href = ((priv.app === 'calendar') && opts.href) || Hash.hashToHref(hashes.editHash || hashes.fileHash, priv.app);
+                        if (priv.app === 'calendar') {
+                            data.href = opts.href;
+                        } else if (hashes.editHash || hashes.fileHash) {
+                            data.href = Hash.hashToHref(hashes.editHash || hashes.fileHash, priv.app);
+                        } else {
+                            data.href = undefined;
+                        }
                         if (hashes.viewHash) {
                             data.roHref = Hash.hashToHref(hashes.viewHash, priv.app);
                         }