yaro/inventory
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some additional work done with CRUDKit. May start this over with a better design for CRUDKit.

Browse source
This commit is contained in:
Yaro Kasear 2025-08-29 16:04:41 -05:00
parent f47fb6b505
commit 7738f1c9c2
5 changed files with 67 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crudkit/html/templates/crudkit/_macros.html
View file

@ -56,7 +56,7 @@
</li>
{% else %}
<li class="page-item">
<a class="page-link" hx-get="{{ _rows_url(model, page, per_page, sort, filters, fields_csv) }}" hx-target="#rows"
<a class="page-link state-modifier" hx-get="{{ _rows_url(model, page, per_page, sort, filters, fields_csv) }}" hx-target="#rows"
hx-swap="innerHTML" data-page="{{ page }}" {{ attrs|safe }}>
{{ label }}
</a>
@ -103,18 +103,6 @@
</ul>
</nav>
{# keep hidden pager-state in sync with one handler instead of inline click spam #}
<script>
document.currentScript?.previousElementSibling?.addEventListener?.('click', function (e) {
const a = e.target.closest('a.page-link');
if (!a) return;
const targetPage = a.getAttribute('data-page');
if (!targetPage) return;
const inp = document.querySelector('#pager-state input[name=page]');
if (inp) inp.value = targetPage;
}, { capture: true });
</script>
{%- endmacro %}
{% macro form(schema, action, method="POST", obj_id=None, hx=False, csrf_token=None) -%}

21
crudkit/service.py
View file

@ -56,7 +56,7 @@ def _apply_dotted_ordering(stmt, Model, sort_tokens):
rel = current_mapper.relationships.get(rel_name)
if rel is None:
# invalid sort key; skip quietly or raise
# raise ValueError(f"Unknown relationship {current_mapper.class_.__name__}.{rel_name}")
print(f"Unknown relationship {current_mapper.class_.__name__}.{rel_name}")
entity = None
break
@ -78,13 +78,20 @@ def _apply_dotted_ordering(stmt, Model, sort_tokens):
continue
col_name = parts[-1]
# Validate final column
if col_name not in current_mapper.columns:
# raise ValueError(f"Unknown column {current_mapper.class_.__name__}.{col_name}")
continue
# # Validate final column
# if col_name not in current_mapper.columns:
# print(f"Unknown column {current_mapper.class_.__name__}.{col_name}")
# continue
col = getattr(entity, col_name) if entity is not Model else getattr(Model, col_name)
stmt = stmt.order_by(col.desc() if direction == "desc" else col.asc())
# col = getattr(entity, col_name) if entity is not Model else getattr(Model, col_name)
attr = getattr(entity, col_name, None)
if attr is None:
attr = getattr(current_mapper.class_, col_name, None)
if attr is None:
print(f"Unknown column {current_mapper.class_.__name__}.{col_name}")
continue
stmt = stmt.order_by(attr.desc() if direction == "desc" else attr.asc())
return stmt