Skip to content

Commit 6ec6d8a

Browse files
committed
add @dantownsend suggestion
1 parent 122c17c commit 6ec6d8a

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ tables:
5757
- address
5858
- city_id
5959
menu_group: Location
60-
rich_text_columns: address
60+
rich_text_columns:
61+
- address
6162
- table_name: city
6263
visible_columns:
6364
- city_id

app/main.py

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,37 +52,35 @@ async def main():
5252
for table in storage.tables.values():
5353
if table._meta.tablename == config.table_name:
5454
# visible columns
55-
try:
55+
if config.visible_columns:
5656
visible_columns = [
57-
column
58-
for column in table._meta.columns
59-
if column._meta.name in config.visible_columns
57+
table._meta.get_column_by_name(column_name)
58+
for column_name in config.visible_columns
6059
]
61-
except TypeError:
60+
else:
6261
visible_columns = table._meta.columns
6362
# visible filters
64-
try:
63+
if config.visible_filters:
6564
visible_filters = [
66-
column
67-
for column in table._meta.columns
68-
if column._meta.name in config.visible_filters
65+
table._meta.get_column_by_name(column_name)
66+
for column_name in config.visible_filters
6967
]
70-
except TypeError:
68+
else:
7169
visible_filters = table._meta.columns
7270
# rich text columns
73-
rich_text_columns = [
74-
column
75-
for column in table._meta.columns
76-
if column._meta.name == config.rich_text_columns
77-
]
71+
if config.rich_text_columns:
72+
rich_text_columns = [
73+
table._meta.get_column_by_name(column_name)
74+
for column_name in config.rich_text_columns
75+
]
76+
else:
77+
rich_text_columns = None
7878
# link column
79-
try:
80-
link_column = [
81-
column
82-
for column in table._meta.columns
83-
if column._meta.name == config.link_column
84-
][0]
85-
except IndexError:
79+
if config.link_column:
80+
link_column = table._meta.get_column_by_name(
81+
config.link_column
82+
)
83+
else:
8684
link_column = None
8785
# menu_group
8886
menu_group = config.menu_group

app/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class AdminTable(BaseModel):
77
table_name: t.Optional[str] = None
88
visible_columns: t.Optional[list[str]] = None
99
visible_filters: t.Optional[list[str]] = None
10-
rich_text_columns: t.Optional[str] = None
10+
rich_text_columns: t.Optional[list[str]] = None
1111
link_column: t.Optional[str] = None
1212
menu_group: t.Optional[str] = None
1313

0 commit comments

Comments
 (0)