From c70dedd94f8ef6ae8e79edc03859bb96e7d35511 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Fri, 8 Nov 2019 16:02:21 -0600
Subject: [PATCH] Fix merge feature for master index grid

at least, for Vue.js / buefy theme
---
 tailbone/templates/master/index.mako | 47 ++++++++++++++--------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/tailbone/templates/master/index.mako b/tailbone/templates/master/index.mako
index 15985e5b..6889ac44 100644
--- a/tailbone/templates/master/index.mako
+++ b/tailbone/templates/master/index.mako
@@ -34,7 +34,7 @@
 
         % endif
 
-        % if master.mergeable and request.has_perm('{}.merge'.format(permission_prefix)):
+        % if master.mergeable and master.has_perm('merge'):
 
             $('form[name="merge-things"] button').button('option', 'disabled', $('.grid').gridcore('count_selected') != 2);
 
@@ -266,29 +266,6 @@
   % endif
 </%def>
 
-<%def name="modify_this_page_vars()">
-  ${parent.modify_this_page_vars()}
-  <script type="text/javascript">
-    % if master.mergeable and request.has_perm('{}.merge'.format(permission_prefix)):
-        TailboneGridData.mergeFormButtonText = "Merge 2 ${model_title_plural}"
-        TailboneGridData.mergeFormSubmitting = false
-        TailboneGrid.methods.submitMergeForm = function() {
-            this.mergeFormSubmitting = true
-            this.mergeFormButtonText = "Working, please wait..."
-        }
-    % endif
-    % if master.deletable and request.has_perm('{}.delete'.format(permission_prefix)) and master.delete_confirm == 'simple':
-        ThisPage.methods.deleteObject = function(url) {
-            if (confirm("Are you sure you wish to delete this ${model_title}?")) {
-                let form = this.$refs.deleteObjectForm
-                form.action = url
-                form.submit()
-            }
-        }
-    % endif
-  </script>
-</%def>
-
 <%def name="make_this_page_component()">
   ${parent.make_this_page_component()}
   <script type="text/javascript">
@@ -315,6 +292,17 @@
   ${parent.modify_this_page_vars()}
   <script type="text/javascript">
 
+    ## delete single object
+    % if master.deletable and master.has_perm('delete') and master.delete_confirm == 'simple':
+        ThisPage.methods.deleteObject = function(url) {
+            if (confirm("Are you sure you wish to delete this ${model_title}?")) {
+                let form = this.$refs.deleteObjectForm
+                form.action = url
+                form.submit()
+            }
+        }
+    % endif
+
     ## enable / disable selected objects
     % if master.supports_set_enabled_toggle and master.has_perm('enable_disable_set'):
 
@@ -407,6 +395,17 @@
             this.$refs.delete_selected_form.submit()
         }
     % endif
+
+    % if master.mergeable and master.has_perm('merge'):
+
+        TailboneGridData.mergeFormButtonText = "Merge 2 ${model_title_plural}"
+        TailboneGridData.mergeFormSubmitting = false
+
+        TailboneGrid.methods.submitMergeForm = function() {
+            this.mergeFormSubmitting = true
+            this.mergeFormButtonText = "Working, please wait..."
+        }
+    % endif
   </script>
 </%def>