Phase 1 fix auth redirect API handling and route issues
This commit is contained in:
@@ -68,7 +68,8 @@ def _render(request: Request, template: str, db, user, **ctx):
|
||||
|
||||
|
||||
def _redirect_denied():
|
||||
return RedirectResponse(url="/system-settings", status_code=303)
|
||||
from app.core.http_responses import ui_access_denied
|
||||
return ui_access_denied()
|
||||
|
||||
|
||||
def _has_perm(db, user, code: str) -> bool:
|
||||
@@ -195,7 +196,7 @@ def invoice_list(request: Request, q: str = ""):
|
||||
user,
|
||||
title="Billing - Invoices",
|
||||
q=q,
|
||||
active_financial_year=financial_year,
|
||||
active_financial_year=_active_financial_year(request),
|
||||
rows=rows,
|
||||
report_summary=report_summary,
|
||||
can_create=_has_perm(db, user, "billing.create"),
|
||||
@@ -378,6 +379,7 @@ def billing_settings_submit(
|
||||
db.close()
|
||||
|
||||
|
||||
@router.get("/invoices/new")
|
||||
@router.get("/new")
|
||||
def invoice_create_page(request: Request):
|
||||
db = CommonSessionLocal()
|
||||
@@ -397,7 +399,7 @@ def invoice_create_page(request: Request):
|
||||
db,
|
||||
user,
|
||||
title="Create Invoice",
|
||||
active_financial_year=financial_year,
|
||||
active_financial_year=_active_financial_year(request),
|
||||
default_billing_period_from=_period_start_for_fy(_active_financial_year(request)).isoformat(),
|
||||
default_billing_period_to=_period_end_for_fy(_active_financial_year(request)).isoformat(),
|
||||
clients=clients,
|
||||
@@ -512,7 +514,7 @@ def fee_structure_list(request: Request, q: str = ""):
|
||||
user,
|
||||
title="Fee Structure",
|
||||
q=q,
|
||||
active_financial_year=financial_year,
|
||||
active_financial_year=_active_financial_year(request),
|
||||
rows=rows,
|
||||
can_import=_has_perm(db, user, "billing_fee_structure.import"),
|
||||
)
|
||||
@@ -627,7 +629,7 @@ def generate_invoices_page(
|
||||
billing_period_to=period_to.isoformat(),
|
||||
auto_generate_only=auto_generate_only,
|
||||
q=q,
|
||||
active_financial_year=financial_year,
|
||||
active_financial_year=_active_financial_year(request),
|
||||
result=None,
|
||||
)
|
||||
finally:
|
||||
@@ -706,7 +708,7 @@ def generate_invoices_submit(
|
||||
billing_period_to=(period_to or date.today()).isoformat(),
|
||||
auto_generate_only=auto_generate_only,
|
||||
q=q,
|
||||
active_financial_year=financial_year,
|
||||
active_financial_year=_active_financial_year(request),
|
||||
result=result,
|
||||
)
|
||||
except ValueError as exc:
|
||||
|
||||
Reference in New Issue
Block a user