Merge branch 'master' into release

README.md

@@ -297,7 +297,7 @@ Based on this example
 | django http   | 8011  | DJANGO_DEV_PORT      | :white_check_mark: | :x:                | :x:                |
 | postgres      | 5433  | HOST_POSTGRES_PORT   | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | memcached     | 11211 | MEMCACHED_PORT       | :white_check_mark: | :x:                | :x:                |
-| geodb         | 5432  | HOST_POSTGRES_PORT   | :white_check_mark: | :white_check_mark: | :x:                |
+| geodb         | 5432  | HOST_GEODB_PORT      | :white_check_mark: | :white_check_mark: | :x:                |
 | minio API     | 8009  | MINIO_API_PORT       | :white_check_mark: | :x:                | :x:                |
 | minio browser | 8010  | MINIO_BROWSER_PORT   | :white_check_mark: | :x:                | :x:                |
 | smtp web      | 8012  | SMTP4DEV_WEB_PORT    | :white_check_mark: | :x:                | :x:                |

docker-app/qfieldcloud/core/admin.py

@@ -795,6 +795,8 @@ class JobAdmin(QFieldCloudModelAdmin):
     )
     has_direct_delete_permission = False
 
+    change_form_template = "admin/job_change_form.html"
+
     def get_queryset(self, request):
         return super().get_queryset(request).defer("output", "feedback")
 
@@ -830,6 +832,11 @@ def get_urls(self):
                 self.admin_site.admin_view(self.export_applyjob_deltafile),
                 name="export_applyjob_deltafile",
             ),
+            path(
+                "<path:object_id>/rerun/",
+                self.admin_site.admin_view(self.rerun_job),
+                name="rerun_job",
+            ),
             *urls,
         ]
 
@@ -886,6 +893,10 @@ def export_applyjob_deltafile(
             },
         )
 
+    def rerun_job(self, request, object_id):
+        Job.objects.filter(pk=object_id).update(status="pending")
+        return HttpResponseRedirect("..")
+
 
 class ApplyJobDeltaInline(admin.TabularInline):
     model = ApplyJobDelta

docker-app/qfieldcloud/core/staticfiles/css/admin.css

@@ -0,0 +1,11 @@
+.login-logo img {
+    width: 100%;
+}
+
+.object-tools{
+    margin-bottom: 1rem;
+}
+
+#jazzy-logo img{
+    box-shadow: none!important;
+}