Merge pull request #70 from level12/69-crudview-args

CrudView template arguments

keg_auth/tests/test_views.py

@@ -490,6 +490,7 @@ def test_add(self):
 
         resp = self.client.get('/users/add')
 
+        assert resp.pyquery('#page-content')('h1').eq(0).text() == 'Create User'
         assert resp.form['email'].value == ''
         assert 'is_superuser' not in resp.form.fields, resp.form.fields.keys()
 
@@ -666,6 +667,7 @@ def test_edit(self):
         user_edit = ents.User.testing_create()
 
         resp = self.client.get('/users/{}/edit'.format(user_edit.id))
+        assert resp.pyquery('#page-content')('h1').eq(0).text() == 'Edit User'
         assert resp.form['email'].value == user_edit.email
         resp.form['email'] = 'foo@bar.baz'
         resp = resp.form.submit()
@@ -791,6 +793,8 @@ def test_list(self):
         assert resp.pyquery('.grid-header-add-link a').attr('href').startswith('/users/add')
         assert resp.pyquery('.datagrid table.records thead th').eq(1).text() == 'User ID'
         assert resp.pyquery('.datagrid table.records tbody td').eq(1).text() == self.current_user.email  # noqa
+        assert resp.pyquery('#page-content')('h1').eq(0).text() == 'Users'
+        assert resp.pyquery('.grid-header-add-link').eq(0).text() == 'Create User'
 
     def test_list_alternate_ident_field(self):
         # with the mock here, authentication/authorization will also be happening on the alternate

keg_auth/views.py

@@ -80,6 +80,9 @@ def page_title(self, action):
     def create_form(self, obj):
         return self.form_cls(obj=obj)
 
+    def form_page_heading(self, action):
+        return self.page_title(action)
+
     def form_template_args(self, arg_dict):
         return arg_dict
 
@@ -91,6 +94,7 @@ def render_form(self, obj, action, form, action_button_text=_('Save Changes')):
             'form': form,
             'obj_inst': obj,
             'page_title': self.page_title(action),
+            'page_heading': self.form_page_heading(action),
         })
         return flask.render_template(self.form_template, **template_args)
 
@@ -203,6 +207,10 @@ def make_grid(self):
         grid.apply_qs_args()
         return grid
 
+    @property
+    def grid_page_heading(self):
+        return self.page_title(_('list'))
+
     def grid_template_args(self, arg_dict):
         return arg_dict
 
@@ -215,6 +223,8 @@ def render_grid(self):
         template_args = self.grid_template_args({
             'add_url': flask.url_for(self.endpoint_for_action('add'), session_key=grid.session_key),
             'page_title': self.page_title(_('list')),
+            'page_heading': self.grid_page_heading,
+            'object_name': self.object_name,
             'grid': grid,
         })