various fixes

cookbook/migrations/0012_auto_20191118_1251.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.7 on 2019-11-18 11:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0011_recipe_time'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='recipe',
+            name='time',
+            field=models.IntegerField(default=0),
+        ),
+    ]

cookbook/models.py

@@ -61,7 +61,7 @@ class Recipe(models.Model):
     file_path = models.CharField(max_length=512, default="")
     link = models.CharField(max_length=512, default="")
     keywords = models.ManyToManyField(Keyword, blank=True)
-    time = models.IntegerField(blank=True)
+    time = models.IntegerField(default=0)
     internal = models.BooleanField(default=False)
     created_by = models.ForeignKey(User, on_delete=models.PROTECT)
     created_at = models.DateTimeField(auto_now_add=True)

cookbook/templates/recipe_view.html

@@ -86,8 +86,7 @@
     <form method="POST" class="post-form">
         {% csrf_token %}
         <div class="input-group mb-3">
-            <textarea name="text" cols="15" rows="2" class="textarea form-control" required id="id_text">
-            </textarea>
+            <textarea name="text" cols="15" rows="2" class="textarea form-control" required id="id_text"></textarea>
             <div class="input-group-append">
                 <input type="submit" value="{% trans 'Comment' %}" class="btn btn-success">
             </div>

cookbook/views/edit.py

@@ -52,7 +52,8 @@ def internal_recipe_update(request, pk):
     else:
         form = InternalRecipeForm(instance=recipe_instance)
 
-    return render(request, 'forms/edit_internal_recipe.html', {'form': form, 'view_url': reverse('view_recipe', args=[pk])})
+    return render(request, 'forms/edit_internal_recipe.html',
+                  {'form': form, 'view_url': reverse('view_recipe', args=[pk])})
 
 
 class SyncUpdate(LoginRequiredMixin, UpdateView):
@@ -103,6 +104,40 @@ class StorageUpdate(LoginRequiredMixin, UpdateView):
         return context
 
 
+@login_required
+def edit_storage(request, pk):
+    instance = get_object_or_404(Storage, pk=pk)
+
+    if request.method == "POST":
+        form = StorageForm(request.POST)
+        if form.is_valid():
+            instance.name = form.cleaned_data['name']
+            instance.method = form.cleaned_data['method']
+            instance.username = form.cleaned_data['username']
+            instance.url = form.cleaned_data['url']
+
+            if form.cleaned_data['password'] != '__NO__CHANGE__':
+                instance.password = form.cleaned_data['password']
+
+            if form.cleaned_data['token'] != '__NO__CHANGE__':
+                instance.token = form.cleaned_data['token']
+
+            instance.save()
+
+            messages.add_message(request, messages.SUCCESS, _('Storage saved!'))
+            return HttpResponseRedirect(reverse('edit_storage', args=[pk]))
+        else:
+            messages.add_message(request, messages.ERROR, _('There was an error updating this storage backend.!'))
+    else:
+        pseudo_instance = instance
+        pseudo_instance.password = '__NO__CHANGE__'
+        pseudo_instance.token = '__NO__CHANGE__'
+        form = InternalRecipeForm(instance=pseudo_instance)
+
+    return render(request, 'forms/edit_internal_recipe.html',
+                  {'form': form, 'view_url': reverse('view_recipe', args=[pk])})
+
+
 class CommentUpdate(LoginRequiredMixin, UpdateView):
     template_name = "generic/edit_template.html"
     model = Comment