diff --git a/l4d2web/l4d2web/templates/_server_actions.html b/l4d2web/l4d2web/templates/_server_actions.html index ea5c7a3..66b040e 100644 --- a/l4d2web/l4d2web/templates/_server_actions.html +++ b/l4d2web/l4d2web/templates/_server_actions.html @@ -24,13 +24,11 @@ {% endif %} {% if latest_job %}
- {{ latest_job_phrase }} + {% if latest_job_is_running %}since{% endif %} {{ latest_job_at | timeago }} (show all)
{% endif %} - {% if latest_job_is_running %} - - {% endif %} + diff --git a/l4d2web/tests/test_servers.py b/l4d2web/tests/test_servers.py index 2691126..1434557 100644 --- a/l4d2web/tests/test_servers.py +++ b/l4d2web/tests/test_servers.py @@ -685,6 +685,41 @@ def test_rename_preserves_hostname(user_client_with_blueprints) -> None: assert server.hostname == "My Cool Server", "rename must not wipe hostname" +def test_server_detail_no_inline_job_log_pre(user_client_with_blueprints) -> None: + from sqlalchemy import select + + from l4d2web.models import Job, Server + + client, data = user_client_with_blueprints + + with session_scope() as db: + server = Server( + user_id=data["user_id"], + blueprint_id=data["blueprint_id"], + name="jobserver", + port=27099, + rcon_password="x", + actual_state="running", + ) + db.add(server) + db.flush() + job = Job( + user_id=data["user_id"], + server_id=server.id, + operation="start", + state="running", + ) + db.add(job) + db.flush() + server_id = server.id + + res = client.get(f"/servers/{server_id}") + assert res.status_code == 200 + html = res.get_data(as_text=True) + assert 'class="log-stream job-log"' not in html + assert 'data-inline-modal-open="job-log-modal"' in html + + def test_update_server_clears_hostname(user_client_with_blueprints) -> None: from sqlalchemy import select from l4d2web.models import Server