From c38dc8b84295f9d48047e0113f30749b66be9afc Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Tue, 6 Jun 2023 11:54:58 -0500
Subject: [PATCH] Use *actual* current URL for user feedback msg

was using current URL as of page load, but #hash can change after
that, e.g. on profile view
---
 tailbone/static/js/tailbone.feedback.js | 1 +
 tailbone/templates/base.mako            | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tailbone/static/js/tailbone.feedback.js b/tailbone/static/js/tailbone.feedback.js
index 6f687b80..648c9695 100644
--- a/tailbone/static/js/tailbone.feedback.js
+++ b/tailbone/static/js/tailbone.feedback.js
@@ -12,6 +12,7 @@ let FeedbackForm = {
         },
 
         showFeedback() {
+            this.referrer = location.href
             this.showDialog = true
             this.$nextTick(function() {
                 this.$refs.textarea.focus()
diff --git a/tailbone/templates/base.mako b/tailbone/templates/base.mako
index 91589990..723e106c 100644
--- a/tailbone/templates/base.mako
+++ b/tailbone/templates/base.mako
@@ -485,6 +485,7 @@
 
   ${page_help.render_template()}
 
+  % if request.has_perm('common.feedback'):
   <script type="text/x-template" id="feedback-template">
     <div>
 
@@ -570,6 +571,7 @@
 
     </div>
   </script>
+  % endif
 
   ${tailbone_autocomplete_template()}
   ${multi_file_upload.render_template()}
@@ -882,8 +884,6 @@
 <%def name="modify_whole_page_vars()">
   <script type="text/javascript">
 
-    FeedbackFormData.referrer = location.href
-
     % if request.user:
     FeedbackFormData.userUUID = ${json.dumps(request.user.uuid)|n}
     FeedbackFormData.userName = ${json.dumps(six.text_type(request.user))|n}