Misc. template cleanup per oruga effort

This commit is contained in:
Lance Edgar 2024-04-26 11:02:22 -05:00
parent ba32422059
commit 890ec64f3c
20 changed files with 125 additions and 91 deletions

View file

@ -187,7 +187,8 @@ class CommonView(View):
data['client_ip'] = self.request.client_addr
app.send_email('user_feedback', data=data)
return {'ok': True}
return {'error': "Form did not validate!"}
dform = form.make_deform_form()
return {'error': str(dform.error)}
def consume_batch_id(self):
"""

View file

@ -3003,7 +3003,7 @@ class MasterView(View):
button = HTML.tag('b-button', **btn_kw)
button = str(button)
button = button.replace('<b-button ',
'<b-button tag="a"')
'<b-button tag="a" ')
button = HTML.literal(button)
return button

View file

@ -249,6 +249,7 @@ class RoleView(PrincipalMasterView):
factory = self.get_grid_factory()
g = factory(
key='{}.users'.format(route_prefix),
request=self.request,
data=[],
columns=[
'full_name',

View file

@ -47,6 +47,7 @@ class UserView(PrincipalMasterView):
"""
model_class = User
has_rows = True
rows_title = "User Events"
model_row_class = UserEvent
has_versions = True
touchable = True
@ -225,7 +226,7 @@ class UserView(PrincipalMasterView):
# f.set_required('password')
# api_tokens
if self.creating or self.editing:
if self.creating or self.editing or self.deleting:
f.remove('api_tokens')
elif self.has_perm('manage_api_tokens'):
f.set_renderer('api_tokens', self.render_api_tokens)
@ -283,6 +284,7 @@ class UserView(PrincipalMasterView):
factory = self.get_grid_factory()
g = factory(
request=self.request,
key='{}.api_tokens'.format(route_prefix),
data=[],
columns=['description', 'created'],