Redirect to device detail after create; sub-component install UI on parent detail
This commit is contained in:
@@ -759,7 +759,7 @@ def create_app(config_object="config"):
|
||||
flash(f"Device '{name}' added.", "success")
|
||||
if parent_device:
|
||||
return redirect(url_for("device_detail", device_id=parent_device.id))
|
||||
return redirect(url_for("device_list"))
|
||||
return redirect(url_for("device_detail", device_id=device.id))
|
||||
|
||||
return render_template("device_add.html", device_types=device_types,
|
||||
device_locations=device_locations,
|
||||
@@ -809,11 +809,18 @@ def create_app(config_object="config"):
|
||||
if changed:
|
||||
db.commit()
|
||||
flat_installed = []
|
||||
children_avail = {}
|
||||
if device.has_children():
|
||||
for child in device.children:
|
||||
for b in child.batteries:
|
||||
if b.status == "installed":
|
||||
flat_installed.append((b, child.name, child.id))
|
||||
avail_q = db.query(Battery).filter_by(status="available")
|
||||
if child.battery_size:
|
||||
avail_q = avail_q.filter(
|
||||
(Battery.size == child.battery_size) | (Battery.size == None)
|
||||
)
|
||||
children_avail[child.id] = avail_q.order_by(Battery.label).all()
|
||||
return render_template("device_detail.html", device=device, brands=brands,
|
||||
available_batteries=available_batteries,
|
||||
device_types=device_types,
|
||||
@@ -823,7 +830,8 @@ def create_app(config_object="config"):
|
||||
ha_enabled=ha_client.enabled,
|
||||
ha_live_pct=ha_live_pct,
|
||||
logbook_entries=device.logbook_entries,
|
||||
flat_installed=flat_installed)
|
||||
flat_installed=flat_installed,
|
||||
children_avail=children_avail)
|
||||
|
||||
# ------------------------------------------------------------------ #
|
||||
# Devices — edit
|
||||
|
||||
Reference in New Issue
Block a user