diff --git a/cookbook/forms.py b/cookbook/forms.py index 0c85bab3..a57c6b8c 100644 --- a/cookbook/forms.py +++ b/cookbook/forms.py @@ -17,7 +17,7 @@ class EmojiWidget(forms.TextInput): class EditRecipeForm(forms.ModelForm): class Meta: model = Recipe - fields = ('name', 'category', 'keywords', 'path') + fields = ('name', 'category', 'keywords', 'path', 'storage') labels = { 'name': _('Name'), @@ -42,8 +42,20 @@ class KeywordForm(forms.ModelForm): widgets = {'icon': EmojiWidget} -class MonitorForm(forms.Form): - path = forms.CharField(label=_('Path')) +class StorageForm(forms.ModelForm): + username = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password'}), required=False) + password = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}), required=False) + token = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}), required=False) + + class Meta: + model = Storage + fields = ('name', 'method', 'username', 'password', 'token', 'url') + + +class SyncForm(forms.ModelForm): + class Meta: + model = Sync + fields = ('storage', 'path') class BatchEditForm(forms.Form): diff --git a/cookbook/helper/dropbox.py b/cookbook/helper/dropbox.py index c8aed082..672af489 100644 --- a/cookbook/helper/dropbox.py +++ b/cookbook/helper/dropbox.py @@ -8,22 +8,11 @@ from django.conf import settings from cookbook.models import Recipe, Sync, RecipeImport, SyncLog -def sync_all(): - monitors = Sync.objects.all() - - for monitor in monitors: - ret = import_all(monitor) - if not ret: - return ret - - return True - - def import_all(monitor): url = "https://api.dropboxapi.com/2/files/list_folder" headers = { - "Authorization": "Bearer " + settings.DROPBOX_API_KEY, + "Authorization": "Bearer " + monitor.storage.token, "Content-Type": "application/json" } @@ -40,15 +29,15 @@ def import_all(monitor): return r import_count = 0 - for recipe in recipes['entries']: + for recipe in recipes['entries']: # TODO check if has_more is set and import that as well path = recipe['path_lower'] if not Recipe.objects.filter(path=path).exists() and not RecipeImport.objects.filter(path=path).exists(): name = os.path.splitext(recipe['name'])[0] - new_recipe = RecipeImport(name=name, path=path) + new_recipe = RecipeImport(name=name, path=path, storage=monitor.storage) new_recipe.save() import_count += 1 - log_entry = SyncLog(status='SUCCESS', msg='Imported ' + str(import_count) + ' recipes', monitor=monitor) + log_entry = SyncLog(status='SUCCESS', msg='Imported ' + str(import_count) + ' recipes', sync=monitor) log_entry.save() monitor.last_checked = datetime.now() diff --git a/cookbook/migrations/0001_initial.py b/cookbook/migrations/0001_initial.py index 05e513cc..0ee34575 100644 --- a/cookbook/migrations/0001_initial.py +++ b/cookbook/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.5 on 2018-05-14 08:50 +# Generated by Django 2.0.5 on 2018-05-25 13:11 from django.db import migrations, models import django.db.models.deletion @@ -17,6 +17,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=64, unique=True)), + ('icon', models.CharField(blank=True, max_length=1, null=True)), ('description', models.TextField(blank=True, default='')), ('created_by', models.IntegerField(default=0)), ('created_at', models.DateTimeField(auto_now_add=True)), @@ -28,6 +29,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=64, unique=True)), + ('icon', models.CharField(blank=True, max_length=1, null=True)), ('description', models.TextField(blank=True, default='')), ('created_by', models.IntegerField(default=0)), ('created_at', models.DateTimeField(auto_now_add=True)), @@ -44,7 +46,7 @@ class Migration(migrations.Migration): ('created_by', models.IntegerField(default=0)), ('created_at', models.DateTimeField(auto_now_add=True)), ('updated_at', models.DateTimeField(auto_now=True)), - ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.Category')), + ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cookbook.Category')), ('keywords', models.ManyToManyField(blank=True, to='cookbook.Keyword')), ], ), @@ -57,6 +59,18 @@ class Migration(migrations.Migration): ('created_at', models.DateTimeField(auto_now_add=True)), ], ), + migrations.CreateModel( + name='Storage', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128)), + ('method', models.CharField(choices=[('DB', 'Dropbox')], default='DB', max_length=128)), + ('username', models.CharField(blank=True, max_length=128, null=True)), + ('password', models.CharField(blank=True, max_length=128, null=True)), + ('token', models.CharField(blank=True, max_length=512, null=True)), + ('url', models.URLField(blank=True, null=True)), + ], + ), migrations.CreateModel( name='Sync', fields=[ @@ -65,6 +79,7 @@ class Migration(migrations.Migration): ('last_checked', models.DateTimeField()), ('created_at', models.DateTimeField(auto_now_add=True)), ('updated_at', models.DateTimeField(auto_now=True)), + ('storage', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage')), ], ), migrations.CreateModel( @@ -77,4 +92,9 @@ class Migration(migrations.Migration): ('monitor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Sync')), ], ), + migrations.AddField( + model_name='recipe', + name='storage', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage'), + ), ] diff --git a/cookbook/migrations/0002_auto_20180525_1558.py b/cookbook/migrations/0002_auto_20180525_1558.py new file mode 100644 index 00000000..2d78e127 --- /dev/null +++ b/cookbook/migrations/0002_auto_20180525_1558.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.5 on 2018-05-25 13:58 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cookbook', '0001_initial'), + ] + + operations = [ + migrations.RenameField( + model_name='synclog', + old_name='monitor', + new_name='sync', + ), + ] diff --git a/cookbook/migrations/0002_category_icon.py b/cookbook/migrations/0002_category_icon.py deleted file mode 100644 index 315045aa..00000000 --- a/cookbook/migrations/0002_category_icon.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.0.5 on 2018-05-14 08:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cookbook', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='category', - name='icon', - field=models.CharField(blank=True, max_length=4, null=True), - ), - ] diff --git a/cookbook/migrations/0003_auto_20180514_1121.py b/cookbook/migrations/0003_auto_20180514_1121.py deleted file mode 100644 index d24492fc..00000000 --- a/cookbook/migrations/0003_auto_20180514_1121.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.0.5 on 2018-05-14 09:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cookbook', '0002_category_icon'), - ] - - operations = [ - migrations.AddField( - model_name='keyword', - name='icon', - field=models.CharField(blank=True, max_length=1, null=True), - ), - migrations.AlterField( - model_name='category', - name='icon', - field=models.CharField(blank=True, max_length=1, null=True), - ), - ] diff --git a/cookbook/migrations/0003_recipeimport_storage.py b/cookbook/migrations/0003_recipeimport_storage.py new file mode 100644 index 00000000..4c2d523d --- /dev/null +++ b/cookbook/migrations/0003_recipeimport_storage.py @@ -0,0 +1,20 @@ +# Generated by Django 2.0.5 on 2018-05-25 14:05 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('cookbook', '0002_auto_20180525_1558'), + ] + + operations = [ + migrations.AddField( + model_name='recipeimport', + name='storage', + field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.PROTECT, to='cookbook.Storage'), + preserve_default=False, + ), + ] diff --git a/cookbook/migrations/0004_auto_20180515_2035.py b/cookbook/migrations/0004_auto_20180515_2035.py deleted file mode 100644 index 3696d4c8..00000000 --- a/cookbook/migrations/0004_auto_20180515_2035.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.0.5 on 2018-05-15 18:35 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('cookbook', '0003_auto_20180514_1121'), - ] - - operations = [ - migrations.AlterField( - model_name='recipe', - name='category', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cookbook.Category'), - ), - ] diff --git a/cookbook/models.py b/cookbook/models.py index 4f9fa6a4..35bfa27f 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -1,6 +1,36 @@ from django.db import models +class Storage(models.Model): + DROPBOX = 'DB' + STORAGE_TYPES = ((DROPBOX, 'Dropbox'),) + + name = models.CharField(max_length=128) + method = models.CharField(choices=STORAGE_TYPES, max_length=128, default=DROPBOX) + username = models.CharField(max_length=128, blank=True, null=True) + password = models.CharField(max_length=128, blank=True, null=True) + token = models.CharField(max_length=512, blank=True, null=True) + url = models.URLField(blank=True, null=True) + + def __str__(self): + return self.name + + +class Sync(models.Model): + storage = models.ForeignKey(Storage, on_delete=models.PROTECT) + path = models.CharField(max_length=512, default="") + last_checked = models.DateTimeField() + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + +class SyncLog(models.Model): + sync = models.ForeignKey(Sync, on_delete=models.CASCADE) + status = models.CharField(max_length=32) + msg = models.TextField(default="") + created_at = models.DateTimeField(auto_now_add=True) + + class Keyword(models.Model): name = models.CharField(max_length=64, unique=True) icon = models.CharField(max_length=1, blank=True, null=True) @@ -28,6 +58,7 @@ class Category(models.Model): class Recipe(models.Model): name = models.CharField(max_length=128) path = models.CharField(max_length=512, default="") + storage = models.ForeignKey(Storage, on_delete=models.PROTECT) link = models.CharField(max_length=512, default="") category = models.ForeignKey(Category, blank=True, on_delete=models.SET_NULL, null=True) keywords = models.ManyToManyField(Keyword, blank=True) @@ -45,19 +76,6 @@ class Recipe(models.Model): class RecipeImport(models.Model): name = models.CharField(max_length=128) + storage = models.ForeignKey(Storage, on_delete=models.PROTECT) path = models.CharField(max_length=512, default="") created_at = models.DateTimeField(auto_now_add=True) - - -class Sync(models.Model): - path = models.CharField(max_length=512, default="") - last_checked = models.DateTimeField() - created_at = models.DateTimeField(auto_now_add=True) - updated_at = models.DateTimeField(auto_now=True) - - -class SyncLog(models.Model): - monitor = models.ForeignKey(Sync, on_delete=models.CASCADE) - status = models.CharField(max_length=32) - msg = models.TextField(default="") - created_at = models.DateTimeField(auto_now_add=True) diff --git a/cookbook/tables.py b/cookbook/tables.py index bc1979b4..89bbdffb 100644 --- a/cookbook/tables.py +++ b/cookbook/tables.py @@ -39,8 +39,17 @@ class KeywordTable(tables.Table): fields = ('id', 'icon', 'name') +class StorageTable(tables.Table): + id = tables.LinkColumn('edit_storage', args=[A('id')]) + + class Meta: + model = Storage + template_name = 'generic/table_template.html' + fields = ('id', 'name', 'method') + + class ImportLogTable(tables.Table): - monitor_id = tables.LinkColumn('edit_monitor', args=[A('monitor_id')]) + sync_id = tables.LinkColumn('edit_sync', args=[A('sync_id')]) @staticmethod def render_status(value): @@ -52,20 +61,24 @@ class ImportLogTable(tables.Table): class Meta: model = SyncLog template_name = 'generic/table_template.html' - fields = ('status', 'msg', 'monitor_id', 'created_at') + fields = ('status', 'msg', 'sync_id', 'created_at') -class MonitoredPathTable(tables.Table): - id = tables.LinkColumn('edit_monitor', args=[A('id')]) +class SyncTable(tables.Table): + id = tables.LinkColumn('edit_sync', args=[A('id')]) @staticmethod def render_path(value): return format_html('%s' % value) + @staticmethod + def render_storage(value): + return format_html('%s' % value) + class Meta: model = Sync template_name = 'generic/table_template.html' - fields = ('id', 'path', 'last_checked') + fields = ('id', 'path', 'storage', 'last_checked') class RecipeImportTable(tables.Table): diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index 8e5944ad..9f238472 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -65,6 +65,8 @@ class="fas fa-archive"> {% trans 'Category' %} {% trans 'Keyword' %} + {% trans 'Storage Backend' %}
  • @@ -81,6 +83,8 @@ class="far fa-file-alt"> {% trans 'New Recipes' %} {% trans 'Import Log' %} + {% trans 'Storage Backends' %}
  • diff --git a/cookbook/templates/batch/monitor.html b/cookbook/templates/batch/monitor.html index 2937906f..135af690 100644 --- a/cookbook/templates/batch/monitor.html +++ b/cookbook/templates/batch/monitor.html @@ -24,7 +24,7 @@
    - {% trans 'Sync Now!' %} + {% trans 'Sync Now!' %}

    {% render_table monitored_paths %} diff --git a/cookbook/templates/batch/waiting.html b/cookbook/templates/batch/waiting.html new file mode 100644 index 00000000..de51ef42 --- /dev/null +++ b/cookbook/templates/batch/waiting.html @@ -0,0 +1,26 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block title %}{% trans 'Importing Recipes' %}{% endblock %} + + +{% block content %} + +

    + {% trans 'Importing Recipes' %} +

    +
    +
    +
    +
    +
    + +
    + + + +{% endblock %} \ No newline at end of file diff --git a/cookbook/templates/generic/edit_template.html b/cookbook/templates/generic/edit_template.html index 5b6fc96f..443773c7 100644 --- a/cookbook/templates/generic/edit_template.html +++ b/cookbook/templates/generic/edit_template.html @@ -13,6 +13,17 @@

    {% trans 'Edit' %} {{ title }}

    + {% if form.Meta.model|get_class == 'Storage' %} + + {% endif %} +
    {% csrf_token %} {{ form|crispy }} diff --git a/cookbook/templates/generic/new_template.html b/cookbook/templates/generic/new_template.html index 364e4c85..5000072b 100644 --- a/cookbook/templates/generic/new_template.html +++ b/cookbook/templates/generic/new_template.html @@ -13,6 +13,17 @@

    {% trans 'New' %} {{ title }}

    + {% if form.Meta.model|get_class == 'Storage' %} + + {% endif %} + {% csrf_token %} {{ form|crispy }} diff --git a/cookbook/urls.py b/cookbook/urls.py index fff869be..958c9b87 100644 --- a/cookbook/urls.py +++ b/cookbook/urls.py @@ -12,32 +12,37 @@ urlpatterns = [ path('new/recipe_import//', new.create_new_recipe, name='new_recipe_import'), path('new/category/', new.CategoryCreate.as_view(), name='new_category'), path('new/keyword/', new.KeywordCreate.as_view(), name='new_keyword'), + path('new/storage/', new.StorageCreate.as_view(), name='new_storage'), path('list/keyword', lists.keyword, name='list_keyword'), path('list/category', lists.category, name='list_category'), path('list/import_log', lists.sync_log, name='list_import_log'), path('list/import', lists.recipe_import, name='list_import'), + path('list/storage', lists.storage, name='list_storage'), path('edit/recipe//', edit.RecipeUpdate.as_view(), name='edit_recipe'), path('edit/keyword//', edit.KeywordUpdate.as_view(), name='edit_keyword'), path('edit/category//', edit.CategoryUpdate.as_view(), name='edit_category'), - path('edit/monitor//', edit.MonitorUpdate.as_view(), name='edit_monitor'), + path('edit/sync//', edit.SyncUpdate.as_view(), name='edit_sync'), path('edit/import//', edit.ImportUpdate.as_view(), name='edit_import'), + path('edit/storage//', edit.StorageUpdate.as_view(), name='edit_storage'), path('redirect/delete///', edit.delete_redirect, name='redirect_delete'), path('delete/recipe//', edit.RecipeDelete.as_view(), name='delete_recipe'), path('delete/keyword//', edit.KeywordDelete.as_view(), name='delete_keyword'), path('delete/category//', edit.CategoryDelete.as_view(), name='delete_category'), - path('delete/monitor//', edit.MonitorDelete.as_view(), name='delete_monitor'), + path('delete/sync//', edit.MonitorDelete.as_view(), name='delete_sync'), path('delete/import//', edit.ImportDelete.as_view(), name='delete_import'), + path('delete/storage//', edit.StorageDelete.as_view(), name='delete_storage'), - path('batch/monitor', batch.batch_monitor, name='batch_monitor'), + path('batch/sync', batch.batch_monitor, name='batch_monitor'), # TODO move to generic "new" view path('batch/edit', batch.batch_edit, name='batch_edit'), path('batch/import/all', batch.batch_import_all, name='batch_import_all'), + path('batch/sync/wait', batch.sync_wait, name='batch_sync_wait'), path('api/get_file_link//', api.get_file_link, name='api_get_file_link'), - path('api/sync_all/', api.dropbox_sync, name='api_dropbox_sync'), + path('api/sync_all/', api.sync_all, name='api_sync'), path('dal/keyword/', dal.KeywordAutocomplete.as_view(), name='dal_keyword'), ] diff --git a/cookbook/views/api.py b/cookbook/views/api.py index e0ef0616..906a6236 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -4,25 +4,35 @@ from django.utils.translation import gettext as _ from django.contrib.auth.decorators import login_required from django.shortcuts import redirect -from cookbook.models import Recipe +from cookbook.models import Recipe, Sync, Storage from cookbook.helper import dropbox @login_required def get_file_link(request, recipe_id): recipe = Recipe.objects.get(id=recipe_id) - if recipe.link == "": - response = dropbox.get_share_link(recipe.path) # TODO response validation - recipe.link = response['url'] - recipe.save() + + if recipe.storage.method == Storage.DROPBOX: + if recipe.link == "": + response = dropbox.get_share_link(recipe.path) # TODO response validation + recipe.link = response['url'] + recipe.save() return HttpResponse(recipe.link) @login_required -def dropbox_sync(request): - ret = dropbox.sync_all() - if ret: +def sync_all(request): + monitors = Sync.objects.all() + + error = False + for monitor in monitors: + if monitor.storage.method == Storage.DROPBOX: + ret = dropbox.import_all(monitor) + if not ret: + error = True + + if not error: messages.add_message(request, messages.SUCCESS, _('Sync successful!')) return redirect('list_import') else: diff --git a/cookbook/views/batch.py b/cookbook/views/batch.py index 527c69b3..328f82a1 100644 --- a/cookbook/views/batch.py +++ b/cookbook/views/batch.py @@ -5,36 +5,42 @@ from django.contrib.auth.decorators import login_required from django.shortcuts import redirect, render from django_tables2 import RequestConfig -from cookbook.forms import MonitorForm, BatchEditForm, RecipeImport +from cookbook.forms import SyncForm, BatchEditForm, RecipeImport from cookbook.models import Recipe, Category, Sync -from cookbook.tables import MonitoredPathTable +from cookbook.tables import SyncTable from django.utils.translation import gettext as _, ngettext @login_required def batch_monitor(request): if request.method == "POST": - form = MonitorForm(request.POST) + form = SyncForm(request.POST) if form.is_valid(): new_path = Sync() new_path.path = form.cleaned_data['path'] + new_path.storage = form.cleaned_data['storage'] new_path.last_checked = datetime.now() new_path.save() return redirect('batch_monitor') else: - form = MonitorForm() + form = SyncForm() - monitored_paths = MonitoredPathTable(Sync.objects.all()) + monitored_paths = SyncTable(Sync.objects.all()) RequestConfig(request, paginate={'per_page': 25}).configure(monitored_paths) return render(request, 'batch/monitor.html', {'form': form, 'monitored_paths': monitored_paths}) +@login_required +def sync_wait(request): + return render(request, 'batch/waiting.html') + + @login_required def batch_import_all(request): imports = RecipeImport.objects.all() for new_recipe in imports: - recipe = Recipe(name=new_recipe.name, path=new_recipe.path) + recipe = Recipe(name=new_recipe.name, path=new_recipe.path, storage=new_recipe.storage) recipe.save() new_recipe.delete() diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py index 6859eb51..af199c17 100644 --- a/cookbook/views/edit.py +++ b/cookbook/views/edit.py @@ -5,23 +5,23 @@ from django.urls import reverse_lazy, reverse from django.utils.translation import gettext as _ from django.views.generic import UpdateView, DeleteView -from cookbook.forms import EditRecipeForm, CategoryForm, KeywordForm -from cookbook.models import Recipe, Category, Sync, Keyword, RecipeImport +from cookbook.forms import EditRecipeForm, CategoryForm, KeywordForm, StorageForm, SyncForm +from cookbook.models import Recipe, Category, Sync, Keyword, RecipeImport, Storage -class MonitorUpdate(LoginRequiredMixin, UpdateView): +class SyncUpdate(LoginRequiredMixin, UpdateView): template_name = "generic\edit_template.html" model = Sync - fields = ['path'] + form_class = SyncForm # TODO add msg box def get_success_url(self): - return reverse('edit_monitor', kwargs={'pk': self.object.pk}) + return reverse('edit_sync', kwargs={'pk': self.object.pk}) def get_context_data(self, **kwargs): - context = super(MonitorUpdate, self).get_context_data(**kwargs) - context['title'] = _("Monitor") + context = super(SyncUpdate, self).get_context_data(**kwargs) + context['title'] = _("Sync") return context @@ -57,6 +57,22 @@ class KeywordUpdate(LoginRequiredMixin, UpdateView): return context +class StorageUpdate(LoginRequiredMixin, UpdateView): + template_name = "generic\edit_template.html" + model = Storage + form_class = StorageForm + + # TODO add msg box + + def get_success_url(self): + return reverse('edit_storage', kwargs={'pk': self.object.pk}) + + def get_context_data(self, **kwargs): + context = super(StorageUpdate, self).get_context_data(**kwargs) + context['title'] = _("Storage Backend") + return context + + class ImportUpdate(LoginRequiredMixin, UpdateView): template_name = "generic\edit_template.html" model = RecipeImport @@ -154,3 +170,14 @@ class KeywordDelete(LoginRequiredMixin, DeleteView): context = super(KeywordDelete, self).get_context_data(**kwargs) context['title'] = _("Keyword") return context + + +class StorageDelete(LoginRequiredMixin, DeleteView): + template_name = "generic\delete_template.html" + model = Storage + success_url = reverse_lazy('list_storage') + + def get_context_data(self, **kwargs): + context = super(StorageDelete, self).get_context_data(**kwargs) + context['title'] = _("Storage Backend") + return context diff --git a/cookbook/views/lists.py b/cookbook/views/lists.py index 3a435e25..25a551cc 100644 --- a/cookbook/views/lists.py +++ b/cookbook/views/lists.py @@ -4,8 +4,8 @@ from django.shortcuts import render from django_tables2 import RequestConfig from django.utils.translation import gettext as _ -from cookbook.models import Category, Keyword, SyncLog, RecipeImport -from cookbook.tables import CategoryTable, KeywordTable, ImportLogTable, RecipeImportTable +from cookbook.models import Category, Keyword, SyncLog, RecipeImport, Storage +from cookbook.tables import CategoryTable, KeywordTable, ImportLogTable, RecipeImportTable, StorageTable @login_required @@ -38,3 +38,11 @@ def recipe_import(request): RequestConfig(request, paginate={'per_page': 25}).configure(table) return render(request, 'generic/list_template.html', {'title': _("Import"), 'table': table}) + + +@login_required +def storage(request): + table = StorageTable(Storage.objects.all()) + RequestConfig(request, paginate={'per_page': 25}).configure(table) + + return render(request, 'generic/list_template.html', {'title': _("Storage Backend"), 'table': table}) diff --git a/cookbook/views/new.py b/cookbook/views/new.py index f6f68ce0..b31c5220 100644 --- a/cookbook/views/new.py +++ b/cookbook/views/new.py @@ -6,7 +6,7 @@ from django.urls import reverse_lazy from django.utils.translation import gettext as _ from django.views.generic import CreateView -from cookbook.forms import ImportRecipeForm, RecipeImport, CategoryForm, KeywordForm +from cookbook.forms import ImportRecipeForm, RecipeImport, CategoryForm, KeywordForm, Storage, StorageForm from cookbook.models import Category, Keyword, Recipe @@ -46,6 +46,18 @@ class KeywordCreate(LoginRequiredMixin, CreateView): return context +class StorageCreate(LoginRequiredMixin, CreateView): + template_name = "generic\\new_template.html" + model = Storage + form_class = StorageForm + success_url = reverse_lazy('list_storage') + + def get_context_data(self, **kwargs): + context = super(StorageCreate, self).get_context_data(**kwargs) + context['title'] = _("Storage Backend") + return context + + @login_required def create_new_recipe(request, import_id): if request.method == "POST":