Skip to content

Commit

Permalink
Merge pull request #159 from jedie/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
jedie authored Oct 31, 2023
2 parents 57b93dc + 5309ad5 commit 0ae5f45
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion inventory/admin/location.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ def get_queryset(self, request):
),
(_('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,)
Expand Down
4 changes: 3 additions & 1 deletion inventory_project/settings/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

ALLOWED_HOSTS = INTERNAL_IPS

SECURE_SSL_REDIRECT = False

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
Expand All @@ -41,7 +43,7 @@
# 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']
Expand Down

0 comments on commit 0ae5f45

Please sign in to comment.