From e45dfd735178bc781dd9e631e3d27c702a335056 Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@techsupport.coop>
Date: Mon, 15 Apr 2019 20:34:34 -0500
Subject: [PATCH] More tweaks for Buefy support

---
 tailbone/grids/core.py              | 10 +++++-----
 tailbone/templates/grids/buefy.mako | 15 +++++++++------
 tailbone/views/datasync.py          |  1 -
 tailbone/views/email.py             |  1 -
 tailbone/views/master.py            |  4 +---
 tailbone/views/tables.py            |  1 -
 tailbone/views/upgrades.py          |  1 -
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/tailbone/grids/core.py b/tailbone/grids/core.py
index 30708b54..54cfee22 100644
--- a/tailbone/grids/core.py
+++ b/tailbone/grids/core.py
@@ -959,7 +959,7 @@ class Grid(object):
                 'valueless_verbs': valueless,
                 'verb_labels': filtr.verb_labels,
                 'verb': filtr.verb or filtr.default_verb or filtr.verbs[0],
-                'value': filtr.value,
+                'value': six.text_type(filtr.value) if filtr.value is not None else "",
             }
 
         return data
@@ -1088,12 +1088,12 @@ class Grid(object):
                 # leverage configured rendering logic where applicable;
                 # otherwise use "raw" data value as string
                 if self.renderers and name in self.renderers:
-                    row[name] = self.renderers[name](rowobj, name)
+                    value = self.renderers[name](rowobj, name)
                 else:
                     value = self.obtain_value(rowobj, name)
-                    if value is None:
-                        value = ""
-                    row[name] = six.text_type(value)
+                if value is None:
+                    value = ""
+                row[name] = six.text_type(value)
 
             # set action URL(s) for row, as needed
             self.set_action_urls(row, rowobj, i)
diff --git a/tailbone/templates/grids/buefy.mako b/tailbone/templates/grids/buefy.mako
index 314a4c09..fc79848e 100644
--- a/tailbone/templates/grids/buefy.mako
+++ b/tailbone/templates/grids/buefy.mako
@@ -44,11 +44,14 @@
 
   <div style="display: flex; justify-content: space-between; margin-bottom: 0.5em;">
 
-    <div class="filters">
-      % if grid.filterable:
-          ## TODO: stop using |n filter
-          ${grid.render_filters(allow_save_defaults=allow_save_defaults)|n}
-      % endif
+    <div style="display: flex; flex-direction: column; justify-content: space-between;">
+      <div></div>
+      <div class="filters">
+        % if grid.filterable:
+            ## TODO: stop using |n filter
+            ${grid.render_filters(allow_save_defaults=allow_save_defaults)|n}
+        % endif
+      </div>
     </div>
 
     <div style="display: flex; flex-direction: column; justify-content: space-between;">
@@ -107,7 +110,7 @@
             % if grid.is_linked(column['field']):
                 <a :href="props.row._action_url_view" v-html="props.row.${column['field']}"></a>
             % else:
-                {{ props.row.${column['field']} }}
+                <span v-html="props.row.${column['field']}"></span>
             % endif
           </b-table-column>
       % endfor
diff --git a/tailbone/views/datasync.py b/tailbone/views/datasync.py
index ad0f8505..b01d088b 100644
--- a/tailbone/views/datasync.py
+++ b/tailbone/views/datasync.py
@@ -47,7 +47,6 @@ class DataSyncChangesView(MasterView):
     creatable = False
     editable = False
     bulk_deletable = True
-    use_buefy = True
 
     grid_columns = [
         'source',
diff --git a/tailbone/views/email.py b/tailbone/views/email.py
index 43ada2cf..d4c9e702 100644
--- a/tailbone/views/email.py
+++ b/tailbone/views/email.py
@@ -52,7 +52,6 @@ class ProfilesView(MasterView):
     pageable = False
     creatable = False
     deletable = False
-    use_buefy = True
 
     grid_columns = [
         'key',
diff --git a/tailbone/views/master.py b/tailbone/views/master.py
index 0f15ee2e..acda43d6 100644
--- a/tailbone/views/master.py
+++ b/tailbone/views/master.py
@@ -122,8 +122,6 @@ class MasterView(View):
 
     grid_index = None
     use_index_links = False
-    # this should be turned on per-view as progress is made
-    use_buefy = False
 
     has_versions = False
     help_url = None
@@ -254,7 +252,7 @@ class MasterView(View):
         return labels
 
     def get_use_buefy(self):
-        return self.use_buefy and self.rattail_config.getbool('tailbone', 'grids.use_buefy')
+        return self.rattail_config.getbool('tailbone', 'grids.use_buefy', default=False)
 
     ##############################
     # Available Views
diff --git a/tailbone/views/tables.py b/tailbone/views/tables.py
index ddd55f2a..fc6ee6a9 100644
--- a/tailbone/views/tables.py
+++ b/tailbone/views/tables.py
@@ -42,7 +42,6 @@ class TablesView(MasterView):
     viewable = False
     filterable = False
     pageable = False
-    use_buefy = True
 
     grid_columns = [
         'name',
diff --git a/tailbone/views/upgrades.py b/tailbone/views/upgrades.py
index 704c870a..78cbe878 100644
--- a/tailbone/views/upgrades.py
+++ b/tailbone/views/upgrades.py
@@ -68,7 +68,6 @@ class UpgradeView(MasterView):
     executable = True
     execute_progress_template = '/upgrade.mako'
     execute_progress_initial_msg = "Upgrading"
-    use_buefy = True
 
     labels = {
         'executed_by': "Executed by",