From 61a9f0647b2f1a384edbd24e1fd48a8e9b8df251 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Tue, 12 Jul 2022 20:37:38 +0200 Subject: [PATCH 1/2] added userspace admin --- cookbook/admin.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cookbook/admin.py b/cookbook/admin.py index 0e9039997..bdd04f53a 100644 --- a/cookbook/admin.py +++ b/cookbook/admin.py @@ -15,7 +15,7 @@ from .models import (BookmarkletImport, Comment, CookLog, Food, FoodInheritField Recipe, RecipeBook, RecipeBookEntry, RecipeImport, SearchPreference, ShareLink, ShoppingList, ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage, Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog, - TelegramBot, Unit, UserFile, UserPreference, ViewLog, Automation) + TelegramBot, Unit, UserFile, UserPreference, ViewLog, Automation, UserSpace) class CustomUserAdmin(UserAdmin): @@ -46,6 +46,14 @@ class SpaceAdmin(admin.ModelAdmin): admin.site.register(Space, SpaceAdmin) +class UserSpaceAdmin(admin.ModelAdmin): + list_display = ('user', 'space',) + search_fields = ('user', 'space',) + + +admin.site.register(UserSpace, UserSpaceAdmin) + + class UserPreferenceAdmin(admin.ModelAdmin): list_display = ('name', 'theme', 'nav_color', 'default_page', 'search_style',) # TODO add new fields search_fields = ('user__username',) From 1cb37fe2d25d6572fab033c9b15dd1fa244bece8 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 13 Jul 2022 10:25:22 +0200 Subject: [PATCH 2/2] dont allow space manage page in demo --- cookbook/views/views.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cookbook/views/views.py b/cookbook/views/views.py index deb8821ef..f7594173f 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -519,6 +519,9 @@ def invite_link(request, token): @group_required('admin') def space_manage(request, space_id): + if request.space.demo: + messages.add_message(request, messages.ERROR, _('This feature is not available in the demo version!')) + return redirect('index') space = get_object_or_404(Space, id=space_id) switch_user_active_space(request.user, space) return render(request, 'space_manage.html', {})