uprawnienia do stacji i usuwanie firm

app/main.py

@@ -365,6 +365,22 @@ def stations():
     page = request.args.get("page", 1, type=int)
     sort = request.args.get("sort", "company_name")
     direction = request.args.get("direction", "asc")
+    companies_q = CompanySettings.query.filter_by(active=True).order_by(CompanySettings.name.asc())
+    if current_user.role == "boss":
+        companies_q = companies_q.filter_by(id=current_user.company_id)
+    companies = companies_q.all()
+    requested_company_id = request.args.get("company_id", type=int)
+    if current_user.role == "boss":
+        company = current_user.company
+    elif requested_company_id is None:
+        return render_template("stations_company_select.html", companies=companies)
+    else:
+        company = db.session.get(CompanySettings, requested_company_id)
+        if company not in companies:
+            abort(404, description="Nie znaleziono aktywnej firmy")
+    if company is None:
+        abort(404, description="Brak aktywnej firmy do konfiguracji")
+
     query = FuelStationCompany.query.filter_by(active=True)
     if q:
         terms = [term for term in q.split() if term]
@@ -375,19 +391,6 @@ def stations():
     column = columns.get(sort, FuelStationCompany.company_name)
     query = query.order_by(column.desc() if direction == "desc" else column.asc(), FuelStationCompany.brand_name.asc())
     station_page = query.paginate(page=page, per_page=30, error_out=False)
-    companies_q = CompanySettings.query.filter_by(active=True).order_by(CompanySettings.name.asc())
-    if current_user.role == "boss":
-        companies_q = companies_q.filter_by(id=current_user.company_id)
-    companies = companies_q.all()
-    requested_company_id = request.args.get("company_id", type=int)
-    if current_user.role == "boss":
-        company = current_user.company
-    else:
-        company = db.session.get(CompanySettings, requested_company_id) if requested_company_id else None
-        if company not in companies:
-            company = companies[0] if companies else None
-    if company is None:
-        abort(404, description="Brak aktywnej firmy do konfiguracji")
     cards_q=FuelCard.query.filter_by(active=True, company_id=company.id)
     cards=cards_q.order_by(FuelCard.name).all()
     rules={(r.fuel_card_id,r.station_company_id):r for r in FuelCardStationRule.query.filter(FuelCardStationRule.fuel_card_id.in_([c.id for c in cards] or [-1])).all()}