Apply suggestions from code review

Co-authored-by: Raphael Michel <michel@rami.io>

src/pretix/base/datasync/datasync.py

@@ -245,6 +245,9 @@ class OutboundSyncProvider:
                     sq.in_flight_since = now()
                     sq.save()
                 except DatabaseError:
+                    # Either select_for_update failed to lock the row, or we couldn't set in_flight
+                    # as this order is already in flight (UNIQUE violation). In either case, we ignore
+                    # this order for now.
                     continue
                 try:
                     mapped_objects = self.sync_order(sq.order)

src/pretix/base/models/datasync.py

@@ -51,7 +51,7 @@ class OrderSyncQueue(models.Model):
     not_before = models.DateTimeField(blank=False, null=False, db_index=True)
     need_manual_retry = models.CharField(blank=True, null=True, max_length=20, choices=[
         ('exceeded', _('Temporary error, auto-retry limit exceeded')),
-        ('permanent', _('Misconfiguration, please check provider settings')),
+        ('permanent', _('Provider reported a permanent error')),
         ('config', _('Misconfiguration, please check provider settings')),
         ('internal', _('System error, needs manual intervention')),
         ('timeout', _('System error, needs manual intervention')),

src/pretix/control/templates/pretixcontrol/datasync/control_order_info.html

@@ -15,12 +15,12 @@
                     {% csrf_token %}
                     {% if pending %}
                         {% if pending.not_before > now or pending.need_manual_retry %}
-                        <button type="submit" name="run_job_now" value="{{ pending.pk }}" class="btn btn-default"><i class="fa fa-refresh"></i> {% trans "Retry now" %}</button>
+                            <button type="submit" name="run_job_now" value="{{ pending.pk }}" class="btn btn-default"><i class="fa fa-refresh"></i> {% trans "Retry now" %}</button>
                         {% endif %}
                         <button type="submit" name="cancel_job" value="{{ pending.pk }}" class="btn btn-danger"><i class="fa fa-times"></i> {% trans "Cancel" %}</button>
                     {% else %}
-                            <button type="submit" class="btn btn-default"><i class="fa fa-refresh"></i> {% trans "Sync now" %}</button>
-                            <input type="hidden" name="queue_sync" value="true">
+                        <button type="submit" class="btn btn-default"><i class="fa fa-refresh"></i> {% trans "Sync now" %}</button>
+                        <input type="hidden" name="queue_sync" value="true">
                     {% endif %}
                 </form>
                 <p><b>{{ display_name }}</b></p>
@@ -33,7 +33,8 @@
                             <i class="fa fa-warning"></i>
                             {% blocktrans trimmed with num=pending.failed_attempts max=pending.max_retry_attempts %}
                             Error. Retry {{ num }} of {{ max }}.
-                            {% endblocktrans %}{% if pending.not_before %}
+                            {% endblocktrans %}
+                            {% if pending.not_before %}
                                 {% blocktrans trimmed with datetime=pending.not_before|date:"SHORT_DATETIME_FORMAT" %}
                                 Waiting until {{ datetime }}
                                 {% endblocktrans %}

src/pretix/control/templates/pretixcontrol/datasync/failed_jobs.html

@@ -65,8 +65,8 @@
             <tfoot>
                 <tr>
                     <td colspan="5">
-                        <button type="submit" name="action" value="retry" class="btn btn-primary"><i class="fa fa-refresh"></i> Retry selected</button>
-                        <button type="submit" name="action" value="cancel" class="btn btn-danger"><i class="fa fa-times"></i> Cancel selected</button>
+                        <button type="submit" name="action" value="retry" class="btn btn-primary"><i class="fa fa-refresh"></i> {% trans "Retry selected" %}</button>
+                        <button type="submit" name="action" value="cancel" class="btn btn-danger"><i class="fa fa-times"></i> {% trans "Cancel selected" %}</button>
                     </td>
                     {% if staff_session %}
                         <td></td><td></td>

src/pretix/control/views/datasync.py

@@ -129,6 +129,8 @@ class GlobalFailedSyncJobsView(AdministratorPermissionRequiredMixin, FailedSyncJ
 
 
 class OrganizerFailedSyncJobsView(OrganizerPermissionRequiredMixin, FailedSyncJobsView):
+    permission = "can_change_organizer_settings"
+
     def get_queryset(self):
         return super().get_queryset().filter(
             event__organizer=self.request.organizer