version script updates and system page fix
This commit is contained in:
parent
0c62b80e3a
commit
dae7cbfb85
@ -18,7 +18,7 @@
|
||||
{% endblocktrans %}
|
||||
|
||||
<h3 class="mt-5">{% trans 'System Information' %}</h3>
|
||||
{% if version_if %}
|
||||
{% if version_info %}
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="list-group">
|
||||
|
@ -7,7 +7,7 @@ from rest_framework.schemas import get_schema_view
|
||||
|
||||
from cookbook.helper import dal
|
||||
from recipes.settings import DEBUG, PLUGINS
|
||||
from version_info import TANDOOR_VERSION
|
||||
from cookbook.version_info import TANDOOR_VERSION
|
||||
|
||||
from .models import (Automation, Comment, CustomFilter, Food, InviteLink, Keyword, MealPlan, Recipe,
|
||||
RecipeBook, RecipeBookEntry, RecipeImport, ShoppingList, Step, Storage,
|
||||
|
@ -1,7 +1,5 @@
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import traceback
|
||||
from datetime import datetime
|
||||
from uuid import UUID
|
||||
|
||||
@ -24,10 +22,9 @@ from cookbook.helper.permission_helper import group_required, has_group_permissi
|
||||
from cookbook.models import (Comment, CookLog, InviteLink, SearchFields, SearchPreference, ShareLink,
|
||||
Space, ViewLog, UserSpace)
|
||||
from cookbook.tables import (CookLogTable, ViewLogTable)
|
||||
from cookbook.version_info import VERSION_INFO
|
||||
from recipes.settings import PLUGINS
|
||||
|
||||
from version_info import VERSION_INFO
|
||||
|
||||
|
||||
def index(request):
|
||||
with scopes_disabled():
|
||||
|
@ -69,6 +69,6 @@ except subprocess.CalledProcessError as e:
|
||||
except:
|
||||
traceback.print_exc()
|
||||
|
||||
with open('version_info.py', 'w+', encoding='UTF-8') as f:
|
||||
with open('cookbook/version_info.py', 'w+', encoding='UTF-8') as f:
|
||||
print(f"writing version info {version_info}")
|
||||
f.write(f'TANDOOR_VERSION = "{tandoor_tag}"\nTANDOOR_REF = "{tandoor_hash}"\nVERSION_INFO = {version_info}')
|
||||
|
Loading…
Reference in New Issue
Block a user