Skip to content

Host info for logs #444

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

Merged
catborise merged 2 commits into from
Jun 2, 2021
Merged

Host info for logs #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
610efd5
add host name for logs beside others
catborise May 31, 2021
24cd3f7
make dynamic websockify path for console-vnc-full
catborise Jun 2, 2021
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
2 changes: 2 additions & 0 deletions admin/templates/admin/logs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<th scope="col">#</th>
<th scope="col">{% trans "Date" %}</th>
<th scope="col">{% trans "User" %}</th>
<th scope="col">{% trans "Host" %}</th>
<th scope="col">{% trans "Instance" %}</th>
<th scope="col">{% trans "Message" %}</th>
</tr>
Expand All @@ -34,6 +35,7 @@
<td>{{ log.id }}</td>
<td style="width:130px;">{{ log.date|date:"M d H:i:s" }}</td>
<td>{{ log.user }}</td>
<td>{{ log.host }}</td>
<td>{{ log.instance }}</td>
<td>{{ log.message }}</td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions appsettings/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def appsettings(request):
themes_list = os.listdir(sass_dir.value + "/wvc-theme")
except FileNotFoundError as err:
messages.error(request, err)
addlogmsg(request.user.username, "", err)
addlogmsg(request.user.username, "-", "", err)

# Bootstrap settings related with filesystems, because of that they are excluded from other settings
appsettings = AppSettings.objects.exclude(description__startswith="Bootstrap").order_by("name")
Expand All @@ -41,7 +41,7 @@ def appsettings(request):
msg = err
messages.error(request, msg)

addlogmsg(request.user.username, "", msg)
addlogmsg(request.user.username, "-", "", msg)
return HttpResponseRedirect(request.get_full_path())

if "BOOTSTRAP_THEME" in request.POST:
Expand Down Expand Up @@ -70,7 +70,7 @@ def appsettings(request):
msg = err
messages.error(request, msg)

addlogmsg(request.user.username, "", msg)
addlogmsg(request.user.username, "-", "", msg)
return HttpResponseRedirect(request.get_full_path())

for setting in appsettings:
Expand All @@ -85,7 +85,7 @@ def appsettings(request):
msg = err
messages.error(request, msg)

addlogmsg(request.user.username, "", msg)
addlogmsg(request.user.username, "-", "", msg)
return HttpResponseRedirect(request.get_full_path())

return render(request, "appsettings.html", locals())
3 changes: 2 additions & 1 deletion console/templates/console-vnc-full.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ <h1 class="noVNC_logo" translate="no"><span>no</span><br>VNC</h1>
</li>
<li>
<label for="noVNC_setting_path">Path:</label>
<input id="noVNC_setting_path" type="text" value="websockify">
<!-- <input id="noVNC_setting_path" type="text" value="websockify"> -->
<input id="noVNC_setting_path" type="text" value="{{ ws_path }}">
</li>
</ul></div>
</li>
Expand Down
Loading