Merge branch 'feed_form_review' of github.com:Xpirix/qgis-feed into u…

…se_webpack_bulma
qgis · Oct 23, 2023 · 17ef400 · 17ef400
2 parents 4d5d5ab + 74b0d5d
commit 17ef400
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/qgisfeedproject/qgisfeed/forms.py b/qgisfeedproject/qgisfeed/forms.py
@@ -2,7 +2,7 @@
 
 from .models import QgisFeedEntry
 from .languages import LANGUAGES
-
+from django.utils import timezone
 
 class FeedEntryFilterForm(forms.Form):
     """
@@ -111,6 +111,7 @@ class Meta:
 
     publish_from = forms.CharField(
         required=False,
+        initial=timezone.now(),
         widget=forms.DateTimeInput(
             attrs={
                 'type': 'datetime-local', 
@@ -120,6 +121,7 @@ class Meta:
     )
     publish_to = forms.CharField(
         required=False,
+        initial=timezone.now() + timezone.timedelta(days=30),
         widget=forms.DateTimeInput(
             attrs={
                 'type': 'datetime-local', 

diff --git a/qgisfeedproject/static/js/feed_item_form.js b/qgisfeedproject/static/js/feed_item_form.js
@@ -20,7 +20,6 @@ var languagePreview = document.getElementById("languagePreview");
 var spatialFilterPreview = document.getElementById("spatialFilterPreview");
 var publishFromPreview = document.getElementById("publishFromPreview");
 var publishToPreview = document.getElementById("publishToPreview");
-var imagePreview = document.getElementById("imagePreview");
 
 var imageFileName = document.getElementById("imageFileName");
 
@@ -52,7 +51,7 @@ imageField.addEventListener("change", function () {
     } else {
       item.innerHTML = "";
       imageFileName.innerHTML =
-        "<i>No image choosed. Click here to add an image.</i>";
+        "<i>No image chosen. Click here to add an image.</i>";
     }
   });
 });

diff --git a/qgisfeedproject/templates/feeds/feed_item_form_widgets.html b/qgisfeedproject/templates/feeds/feed_item_form_widgets.html
@@ -29,7 +29,7 @@
                     {% if form.image.value %}
                     {{ form.image.value.name }}
                     {% else %}
-                    <i>No image choosed. Click here to add an image.</i>
+                    <i>No image chosen. Click here to add an image.</i>
                     {% endif %}
                 </span>
             </label>