Skip to content

Fix scene edit not showing or saving HA/OpenHAB entity binding #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesmulcahy wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Fix scene edit not showing or saving HA/OpenHAB entity binding #372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions docker/web/nspanelmanager/web/htmx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,14 +727,39 @@ def partial_entity_edit_scene_entity(request, scene_id):

request.session["action"] = "ADD_SCENE_TO_NSPANEL_ENTITY_PAGE"
request.session["action_args"] = json.dumps(action_args)
request.session["entity_source"] = scene.scene_type

data = {
"scene": scene,
"edit_scene_id": scene.id,
"entity": {
"name": scene.friendly_name,
},
"entity_source": scene.scene_type,
"backend_name": scene.backend_name,
"home_assistant_items": [],
"openhab_items": [],
}

if scene.scene_type == "home_assistant":
ha_items = web.home_assistant_api.get_all_home_assistant_items({"type": ["scene", "script"]})
if len(ha_items["errors"]) == 0:
data["home_assistant_items"] = ha_items["items"]
else:
return JsonResponse(
{"status": "error", "text": "Failed to get items from Home Assistant!"},
status=500,
)
elif scene.scene_type == "openhab":
openhab_items = web.openhab_api.get_all_openhab_scenes()
if len(openhab_items["errors"]) == 0:
data["openhab_items"] = openhab_items["items"]
else:
return JsonResponse(
{"status": "error", "text": "Failed to get items from OpenHAB!"},
status=500,
)

return render(request, "partial/select_entity/entity_add_or_edit_scene.html", data)


Expand Down Expand Up @@ -1395,6 +1420,8 @@ def create_or_update_scene_entity(request):

if "entity_id" in action_args and int(action_args["entity_id"]) >= 0:
new_scene = Scene.objects.get(id=int(action_args["entity_id"]))
if new_scene.scene_type in ("home_assistant", "openhab") and "backend_name" in request.POST:
new_scene.backend_name = request.POST["backend_name"]
else:
new_scene = Scene()
if "room_id" in action_args:
Expand Down