Skip to content

Commit c2c0c94

Browse files
committed
fixed naming of action buttons
1 parent 0df6695 commit c2c0c94

1 file changed

Lines changed: 15 additions & 16 deletions

File tree

py4web/utils/grid.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -360,19 +360,17 @@ def __init__(
360360
text,
361361
url,
362362
icon=None,
363-
additional_classes="",
364-
override_classes="",
363+
additional_classes=None,
364+
override_classes=None,
365365
message="",
366-
ignore_attribute_plugin=False,
367-
name="",
366+
name="grid-button",
368367
):
369368
self.text = text
370369
self.url = url
371370
self.icon = icon
372371
self.additional_classes = additional_classes
373372
self.override_classes = override_classes
374373
self.message = message
375-
self.ignore_attribute_plugin = ignore_attribute_plugin
376374
self.name = name
377375

378376

@@ -927,17 +925,18 @@ def _make_action_button(
927925
if row_id:
928926
url += f"/{row_id}"
929927

930-
classes = self.get_style(name)
931-
932928
if callable(additional_classes):
933929
additional_classes = additional_classes(row)
934930

935931
if callable(override_classes):
936932
override_classes = override_classes(row)
937933

938-
if override_classes:
939-
classes = join_classes(override_classes)
940-
elif additional_classes:
934+
if override_classes in (None, False):
935+
classes = self.get_style(name)
936+
else:
937+
classes = override_classes
938+
939+
if additional_classes:
941940
classes = join_classes(classes, additional_classes)
942941

943942
if callable(url):
@@ -1313,7 +1312,7 @@ def _make_table(self):
13131312
elif callable(element):
13141313
grid_header.append(element())
13151314
else:
1316-
override_classes = element.__dict__.get("override_classes", None)
1315+
override_classes = element.override_classes
13171316
if not override_classes:
13181317
override_classes = join_classes(
13191318
self.get_style("grid-header-element"),
@@ -1328,8 +1327,8 @@ def _make_table(self):
13281327
additional_classes=element.additional_classes,
13291328
override_classes=override_classes,
13301329
message=element.message,
1331-
name=element.__dict__.get("name"),
1332-
**element.__dict__.get("attrs", dict()),
1330+
name=element.name,
1331+
**element.attrs,
13331332
)
13341333
)
13351334

@@ -1387,7 +1386,7 @@ def _make_table(self):
13871386
elif callable(element):
13881387
html.append(element())
13891388
else:
1390-
override_classes = element.__dict__.get("override_classes", None)
1389+
override_classes = element.override_classes
13911390
if not override_classes:
13921391
override_classes = join_classes(
13931392
self.get_style("grid-footer-element"),
@@ -1402,8 +1401,8 @@ def _make_table(self):
14021401
additional_classes=element.additional_classes,
14031402
override_classes=override_classes,
14041403
message=element.message,
1405-
name=element.__dict__.get("name"),
1406-
**element.__dict__.get("attrs", dict()),
1404+
name=element.name,
1405+
**element.attrs,
14071406
)
14081407
)
14091408

0 commit comments

Comments
 (0)