Refactory Buefy templates to use WholePage and ThisPage components
plus add `GridFilter.set_choices()` method
This commit is contained in:
parent
c64fca852c
commit
1bb0330ab5
36 changed files with 806 additions and 613 deletions
|
@ -38,7 +38,6 @@ from rattail.bouncer.config import get_profile_keys
|
|||
from pyramid.response import FileResponse
|
||||
from webhelpers2.html import HTML, tags
|
||||
|
||||
from tailbone import grids
|
||||
from tailbone.views import MasterView
|
||||
|
||||
|
||||
|
@ -76,18 +75,17 @@ class EmailBouncesView(MasterView):
|
|||
def configure_grid(self, g):
|
||||
super(EmailBouncesView, self).configure_grid(g)
|
||||
|
||||
g.joiners['processed_by'] = lambda q: q.outerjoin(model.User)
|
||||
g.filters['config_key'].set_choices(self.handler_options)
|
||||
g.filters['config_key'].default_active = True
|
||||
g.filters['config_key'].default_verb = 'equal'
|
||||
|
||||
g.filters['config_key'].set_value_renderer(grids.filters.ChoiceValueRenderer(self.handler_options))
|
||||
g.joiners['processed_by'] = lambda q: q.outerjoin(model.User)
|
||||
g.filters['processed'].default_active = True
|
||||
g.filters['processed'].default_verb = 'is_null'
|
||||
g.filters['processed_by'] = g.make_filter('processed_by', model.User.username)
|
||||
g.sorters['processed_by'] = g.make_sorter(model.User.username)
|
||||
g.set_sort_defaults('bounced', 'desc')
|
||||
|
||||
g.set_label('config_key', "Source")
|
||||
g.set_label('bounce_recipient_address', "Bounced To")
|
||||
g.set_label('intended_recipient_address', "Intended For")
|
||||
|
||||
|
|
|
@ -217,8 +217,8 @@ class PeopleView(MasterView):
|
|||
return HTML.tag('ul', c=items)
|
||||
elif self.viewing and self.request.has_perm('users.create'):
|
||||
if use_buefy:
|
||||
return HTML.tag('button', type='button', class_='button is-primary',
|
||||
id='make-user', c="Make User")
|
||||
return HTML.tag('b-button', type='is-primary', c="Make User",
|
||||
**{'@click': 'clickMakeUser()'})
|
||||
else:
|
||||
return HTML.tag('button', type='button', id='make-user', c="Make User")
|
||||
else:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue