Skip to content

Commit

Permalink
display environment, version at menu bottom
Browse files Browse the repository at this point in the history
  • Loading branch information
lamontfr committed Jun 19, 2017
1 parent 4b584ae commit 9279b3c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 1 deletion.
3 changes: 3 additions & 0 deletions docker-compose.yml
Expand Up @@ -14,6 +14,9 @@ services:
- backend

web:
environment:
- SOUSCHEF_ENVIRONMENT_NAME=DEV
- SOUSCHEF_VERSION=v1.0-beta
restart: always
build: .
volumes:
Expand Down
5 changes: 4 additions & 1 deletion src/sous_chef/context_processors.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-

from django.conf import settings
from member.models import Client, Route
from order.models import Order, ORDER_STATUS_ORDERED
from note.models import Note, NoteFilter
Expand All @@ -26,7 +27,9 @@ def total(request):
'CLIENT_FILTER_DEFAULT_STATUS': Client.ACTIVE,
'ORDER_FILTER_DEFAULT_STATUS': ORDER_STATUS_ORDERED,
'ORDER_FILTER_DEFAULT_DATE': datetime.datetime.now(),
'NOTE_FILTER_DEFAULT_IS_READ': NoteFilter.NOTE_STATUS_UNREAD
'NOTE_FILTER_DEFAULT_IS_READ': NoteFilter.NOTE_STATUS_UNREAD,
'SC_ENVIRONMENT_NAME': settings.SOUSCHEF_ENVIRONMENT_NAME,
'SC_VERSION': settings.SOUSCHEF_VERSION,
}

return COMMON_CONTEXT
4 changes: 4 additions & 0 deletions src/sous_chef/settings.py
Expand Up @@ -207,3 +207,7 @@
'avatar.providers.GravatarAvatarProvider',
'avatar.providers.DefaultAvatarProvider',
)

# Displayable information
SOUSCHEF_VERSION = os.environ.get('SOUSCHEF_VERSION') or ''
SOUSCHEF_ENVIRONMENT_NAME = os.environ.get('SOUSCHEF_ENVIRONMENT_NAME') or ''
1 change: 1 addition & 0 deletions src/sous_chef/templates/system/menu.html
Expand Up @@ -50,4 +50,5 @@ <h4 class="ui header name">
<a class="item" href="{% url 'billing:list' %}"><i class="dollar icon"></i>{% trans 'Billing' %}</a>
{% if request.user.is_superuser %}<a class="item" href="{% url 'admin:index' %}"><i class="settings icon"></i>{% trans 'Admin' %}</a>{% endif %}
<a href="{% url 'page:logout' %}" class="item"><i class="sign out icon"></i>{% trans 'Logout' %}</a>
<p style="color:aqua;"> {{ SC_ENVIRONMENT_NAME }} {{ SC_VERSION }}</p>
</div>

0 comments on commit 9279b3c

Please sign in to comment.