Merge pull request #159 from jedie/dev

Dev
pull/162/head
Jens Diemer 2023-10-31 18:01:26 +01:00 zatwierdzone przez GitHub
commit 0ae5f45530
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 4 dodań i 2 usunięć

Wyświetl plik

@ -148,6 +148,7 @@ please use YunoHost ;)
* [**dev**](https://github.com/jedie/PyInventory/compare/v0.19.2...main)
* Bugfix the "parent" field on location admin page
* tbc
* [v0.19.2 - 17.08.2023](https://github.com/jedie/PyInventory/compare/v0.19.1...v0.19.2)
* Bugfix packaging and missing "requests" dependencies

Wyświetl plik

@ -70,7 +70,6 @@ class LocationModelAdmin(ImportExportMixin, BaseUserAdmin):
),
(_('Items in this Location'), {'fields': ('items',)}),
)
autocomplete_fields = ('parent',)
readonly_fields = ('id', 'create_dt', 'update_dt', 'user', 'item_count', 'items')
list_display_links = ('location',)
list_filter = (LimitTreeDepthListFilter,)

Wyświetl plik

@ -26,6 +26,8 @@ INTERNAL_IPS = ('127.0.0.1', '0.0.0.0', 'localhost')
ALLOWED_HOSTS = INTERNAL_IPS
SECURE_SSL_REDIRECT = False
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
@ -41,7 +43,7 @@ print(f'Use Database: {DATABASES["default"]["NAME"]!r}', file=__sys.stderr)
# Download map via geotiler in inventory.gpx_tools.gpxpy2map.generate_map
MAP_DOWNLOAD = True
if __os.environ.get('AUTOLOGIN') == '1':
if __os.environ.get('AUTOLOGIN') != '0':
# Auto login for dev. server:
MIDDLEWARE = MIDDLEWARE.copy()
MIDDLEWARE += ['django_tools.middlewares.local_auto_login.AlwaysLoggedInAsSuperUserMiddleware']