Merge branch 'feature/keywords-rework' into feature/fulltext-search

# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/models.py
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/templates/sw.js
#	cookbook/views/api.py
#	cookbook/views/views.py
#	vue/src/locales/en.json
#	vue/webpack-stats.json
#	vue/yarn.lock

cookbook/admin.py

@@ -1,6 +1,8 @@
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.postgres.search import SearchVector
+from treebeard.admin import TreeAdmin
+from treebeard.forms import movenodeform_factory
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User, Group
 from django_scopes import scopes_disabled
@@ -12,7 +14,9 @@ from .models import (Comment, CookLog, Food, Ingredient, InviteLink, Keyword,
                      ShoppingList, ShoppingListEntry, ShoppingListRecipe,
                      Space, Step, Storage, Sync, SyncLog, Unit, UserPreference,
                      ViewLog, Supermarket, SupermarketCategory, SupermarketCategoryRelation,
-                     ImportLog, TelegramBot, BookmarkletImport)
+                     ImportLog, TelegramBot, BookmarkletImport, UserFile)
+
+from cookbook.managers import DICTIONARY
 
 from cookbook.managers import DICTIONARY
 
@@ -29,14 +33,20 @@ admin.site.unregister(Group)
 
 
 class SpaceAdmin(admin.ModelAdmin):
-    list_display = ('name', 'created_by', 'message')
+    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
+    search_fields = ('name', 'created_by__username')
+    list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
+    date_hierarchy = 'created_at'
 
 
 admin.site.register(Space, SpaceAdmin)
 
 
 class UserPreferenceAdmin(admin.ModelAdmin):
-    list_display = ('name', 'space', 'theme', 'nav_color', 'default_page', 'search_style',)
+    list_display = ('name', 'space', 'theme', 'nav_color', 'default_page', 'search_style',)  # TODO add new fields
+    search_fields = ('user__username', 'space__name')
+    list_filter = ('theme', 'nav_color', 'default_page', 'search_style')
+    date_hierarchy = 'created_at'
 
     @staticmethod
     def name(obj):
@@ -48,6 +58,7 @@ admin.site.register(UserPreference, UserPreferenceAdmin)
 
 class StorageAdmin(admin.ModelAdmin):
     list_display = ('name', 'method')
+    search_fields = ('name',)
 
 
 admin.site.register(Storage, StorageAdmin)
@@ -55,6 +66,7 @@ admin.site.register(Storage, StorageAdmin)
 
 class SyncAdmin(admin.ModelAdmin):
     list_display = ('storage', 'path', 'active', 'last_checked')
+    search_fields = ('storage__name', 'path')
 
 
 admin.site.register(Sync, SyncAdmin)
@@ -78,11 +90,29 @@ class SyncLogAdmin(admin.ModelAdmin):
 
 admin.site.register(SyncLog, SyncLogAdmin)
 
-admin.site.register(Keyword)
+
+class KeywordAdmin(TreeAdmin):
+    form = movenodeform_factory(Keyword)
+    ordering = ('space', 'path',)
+
+    # removing ability to delete keywords from admin
+    # to avoid creating orphaned keywords
+    # def get_actions(self, request):
+    #     actions = super().get_actions(request)
+    #     if 'delete_selected' in actions:
+    #         del actions['delete_selected']
+    #     return actions
+
+    # def has_delete_permission(self, request, obj=None):
+    #     return False
+
+
+admin.site.register(Keyword, KeywordAdmin)
 
 
 class StepAdmin(admin.ModelAdmin):
     list_display = ('name', 'type', 'order')
+    search_fields = ('name', 'type')
 
 
 admin.site.register(Step, StepAdmin)
@@ -101,6 +131,9 @@ def rebuild_index(modeladmin, request, queryset):
 
 class RecipeAdmin(admin.ModelAdmin):
     list_display = ('name', 'internal', 'created_by', 'storage')
+    search_fields = ('name', 'created_by__username')
+    list_filter = ('internal',)
+    date_hierarchy = 'created_at'
 
     @staticmethod
     def created_by(obj):
@@ -118,6 +151,7 @@ admin.site.register(Food)
 
 class IngredientAdmin(admin.ModelAdmin):
     list_display = ('food', 'amount', 'unit')
+    search_fields = ('food__name', 'unit__name')
 
 
 admin.site.register(Ingredient, IngredientAdmin)
@@ -125,6 +159,8 @@ admin.site.register(Ingredient, IngredientAdmin)
 
 class CommentAdmin(admin.ModelAdmin):
     list_display = ('recipe', 'name', 'created_at')
+    search_fields = ('text', 'user__username')
+    date_hierarchy = 'created_at'
 
     @staticmethod
     def name(obj):
@@ -143,6 +179,7 @@ admin.site.register(RecipeImport, RecipeImportAdmin)
 
 class RecipeBookAdmin(admin.ModelAdmin):
     list_display = ('name', 'user_name')
+    search_fields = ('name', 'created_by__username')
 
     @staticmethod
     def user_name(obj):
@@ -172,6 +209,7 @@ admin.site.register(MealPlan, MealPlanAdmin)
 
 class MealTypeAdmin(admin.ModelAdmin):
     list_display = ('name', 'created_by', 'order')
+    search_fields = ('name', 'created_by__username')
 
 
 admin.site.register(MealType, MealTypeAdmin)
@@ -186,7 +224,7 @@ admin.site.register(ViewLog, ViewLogAdmin)
 
 class InviteLinkAdmin(admin.ModelAdmin):
     list_display = (
-        'username', 'group', 'valid_until',
+        'group', 'valid_until',
         'created_by', 'created_at', 'used_by'
     )
 
@@ -255,3 +293,10 @@ class BookmarkletImportAdmin(admin.ModelAdmin):
 
 
 admin.site.register(BookmarkletImport, BookmarkletImportAdmin)
+
+
+class UserFileAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'file_size_kb', 'created_at',)
+
+
+admin.site.register(UserFile, UserFileAdmin)