Compare commits
No commits in common. "8c1dd24955608a9847d3477ad19fc430d5405958" and "2e8a60234312174b4c7357aa0a007c36dbd2c958" have entirely different histories.
8c1dd24955
...
2e8a602343
7 changed files with 3 additions and 32 deletions
|
|
@ -2604,10 +2604,9 @@ class GridAction: # pylint: disable=too-many-instance-attributes
|
||||||
"""
|
"""
|
||||||
html = [
|
html = [
|
||||||
self.render_icon(),
|
self.render_icon(),
|
||||||
HTML.literal(" "),
|
|
||||||
self.render_label(),
|
self.render_label(),
|
||||||
]
|
]
|
||||||
return HTML.tag("span", c=html, style="white-space: nowrap;")
|
return HTML.literal(" ").join(html)
|
||||||
|
|
||||||
def render_icon(self):
|
def render_icon(self):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -402,8 +402,6 @@ def before_render(event):
|
||||||
context = event
|
context = event
|
||||||
context["config"] = config
|
context["config"] = config
|
||||||
context["app"] = app
|
context["app"] = app
|
||||||
context["model"] = app.model
|
|
||||||
context["enum"] = app.enum
|
|
||||||
context["web"] = web
|
context["web"] = web
|
||||||
context["h"] = helpers
|
context["h"] = helpers
|
||||||
context["url"] = request.route_url
|
context["url"] = request.route_url
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,6 @@
|
||||||
:default-sort="${grid.get_vue_first_sorter() or 'null'}"
|
:default-sort="${grid.get_vue_first_sorter() or 'null'}"
|
||||||
% endif
|
% endif
|
||||||
|
|
||||||
hoverable
|
|
||||||
narrowed
|
|
||||||
icon-pack="fas">
|
icon-pack="fas">
|
||||||
|
|
||||||
% for column in grid.get_vue_columns():
|
% for column in grid.get_vue_columns():
|
||||||
|
|
|
||||||
|
|
@ -5,17 +5,6 @@
|
||||||
|
|
||||||
<%def name="content_title()">${instance_title}</%def>
|
<%def name="content_title()">${instance_title}</%def>
|
||||||
|
|
||||||
<%def name="extra_styles()">
|
|
||||||
${parent.extra_styles()}
|
|
||||||
<style>
|
|
||||||
|
|
||||||
.wutta-form-wrapper {
|
|
||||||
width: 75%;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
|
||||||
</%def>
|
|
||||||
|
|
||||||
<%def name="render_instance_header_title_extras()">
|
<%def name="render_instance_header_title_extras()">
|
||||||
${parent.render_instance_header_title_extras()}
|
${parent.render_instance_header_title_extras()}
|
||||||
% if master.should_expose_versions():
|
% if master.should_expose_versions():
|
||||||
|
|
|
||||||
|
|
@ -5,17 +5,6 @@
|
||||||
|
|
||||||
<%def name="content_title()">changes @ TXN ${transaction.id}</%def>
|
<%def name="content_title()">changes @ TXN ${transaction.id}</%def>
|
||||||
|
|
||||||
<%def name="extra_styles()">
|
|
||||||
${parent.extra_styles()}
|
|
||||||
<style>
|
|
||||||
|
|
||||||
.wutta-form-wrapper {
|
|
||||||
width: 75%;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
|
||||||
</%def>
|
|
||||||
|
|
||||||
<%def name="page_content()">
|
<%def name="page_content()">
|
||||||
<div class="wutta-form-wrapper">
|
<div class="wutta-form-wrapper">
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ class PersonView(MasterView): # pylint: disable=abstract-method
|
||||||
# users
|
# users
|
||||||
if self.creating or self.editing:
|
if self.creating or self.editing:
|
||||||
f.remove("users")
|
f.remove("users")
|
||||||
else:
|
elif self.viewing:
|
||||||
f.set_grid("users", self.make_users_grid(person))
|
f.set_grid("users", self.make_users_grid(person))
|
||||||
|
|
||||||
def make_users_grid(self, person):
|
def make_users_grid(self, person):
|
||||||
|
|
|
||||||
|
|
@ -2051,9 +2051,7 @@ class TestGridAction(TestCase):
|
||||||
action, render_icon=lambda: "ICON", render_label=lambda: "LABEL"
|
action, render_icon=lambda: "ICON", render_label=lambda: "LABEL"
|
||||||
):
|
):
|
||||||
html = action.render_icon_and_label()
|
html = action.render_icon_and_label()
|
||||||
self.assertTrue(html.startswith("<span "))
|
self.assertEqual("ICON LABEL", html)
|
||||||
self.assertIn("ICON", html)
|
|
||||||
self.assertIn("LABEL", html)
|
|
||||||
|
|
||||||
def test_get_url(self):
|
def test_get_url(self):
|
||||||
obj = {"foo": "bar"}
|
obj = {"foo": "bar"}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue