playing around
This commit is contained in:
parent
9988a61da7
commit
e77016ea9b
@ -30,6 +30,8 @@
|
|||||||
<a href="https://github.com/vabene1111/recipes/releases/tag/{{ version }}">{{ version }}</a>{% else %}
|
<a href="https://github.com/vabene1111/recipes/releases/tag/{{ version }}">{{ version }}</a>{% else %}
|
||||||
{{ version }}{% endif %}<br/>
|
{{ version }}{% endif %}<br/>
|
||||||
Ref: <a href="https://github.com/vabene1111/recipes/commit/{{ ref }}">{{ ref }}</a>
|
Ref: <a href="https://github.com/vabene1111/recipes/commit/{{ ref }}">{{ ref }}</a>
|
||||||
|
|
||||||
|
<pre>{{ version_info }}</pre>
|
||||||
<br/>
|
<br/>
|
||||||
<br/>
|
<br/>
|
||||||
<br/>
|
<br/>
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
import subprocess
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
|
|
||||||
@ -22,7 +23,7 @@ from cookbook.helper.permission_helper import group_required, has_group_permissi
|
|||||||
from cookbook.models import (Comment, CookLog, InviteLink, SearchFields, SearchPreference, ShareLink,
|
from cookbook.models import (Comment, CookLog, InviteLink, SearchFields, SearchPreference, ShareLink,
|
||||||
Space, ViewLog, UserSpace)
|
Space, ViewLog, UserSpace)
|
||||||
from cookbook.tables import (CookLogTable, ViewLogTable)
|
from cookbook.tables import (CookLogTable, ViewLogTable)
|
||||||
from recipes.settings import PLUGINS
|
from recipes.settings import PLUGINS, BASE_DIR
|
||||||
from recipes.version import BUILD_REF, VERSION_NUMBER
|
from recipes.version import BUILD_REF, VERSION_NUMBER
|
||||||
|
|
||||||
|
|
||||||
@ -317,11 +318,16 @@ def system(request):
|
|||||||
|
|
||||||
secret_key = False if os.getenv('SECRET_KEY') else True
|
secret_key = False if os.getenv('SECRET_KEY') else True
|
||||||
|
|
||||||
|
r = subprocess.check_output(['git', 'show', '-s'], cwd=BASE_DIR)
|
||||||
|
r = subprocess.check_output(['git', 'show', '-s'], cwd=os.path.join(BASE_DIR, 'recipes', 'plugins', 'enterprise_plugin'))
|
||||||
|
version_info = r.decode()
|
||||||
|
|
||||||
return render(request, 'system.html', {
|
return render(request, 'system.html', {
|
||||||
'gunicorn_media': settings.GUNICORN_MEDIA,
|
'gunicorn_media': settings.GUNICORN_MEDIA,
|
||||||
'debug': settings.DEBUG,
|
'debug': settings.DEBUG,
|
||||||
'postgres': postgres,
|
'postgres': postgres,
|
||||||
'version': VERSION_NUMBER,
|
'version': VERSION_NUMBER,
|
||||||
|
'version_info': version_info,
|
||||||
'ref': BUILD_REF,
|
'ref': BUILD_REF,
|
||||||
'plugins': PLUGINS,
|
'plugins': PLUGINS,
|
||||||
'secret_key': secret_key
|
'secret_key': secret_key
|
||||||
|
Loading…
Reference in New Issue
Block a user