Skip to content

Commit

Permalink
fix DeleteView classes for django v4 (#1922)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikkonie committed Aug 7, 2024
1 parent 0a12ff3 commit 54d92e0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
5 changes: 3 additions & 2 deletions isatemplates/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,9 @@ class ISATemplateDeleteView(
slug_field = 'sodar_uuid'
template_name = 'isatemplates/template_confirm_delete.html'

def get_success_url(self):
return self.handle_modify(self.object, 'delete')
def form_valid(self, form):
self.object.delete()
return redirect(self.handle_modify(self.object, 'delete'))


class ISATemplateExportView(LoggedInPermissionMixin, View):
Expand Down
23 changes: 12 additions & 11 deletions samplesheets/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2326,21 +2326,16 @@ class IrodsAccessTicketDeleteView(
slug_url_kwarg = 'irodsaccessticket'
slug_field = 'sodar_uuid'

def get_success_url(self):
return reverse(
'samplesheets:irods_tickets',
kwargs={'project': self.object.get_project().sodar_uuid},
)

def delete(self, request, *args, **kwargs):
def form_valid(self, form):
obj = self.get_object()
irods_backend = get_backend_api('omics_irods')
try:
with irods_backend.get_session() as irods:
irods_backend.delete_ticket(irods, obj.ticket)
except Exception as ex:
messages.error(
request, 'Error deleting iRODS access ticket: {}'.format(ex)
self.request,
'Error deleting iRODS access ticket: {}'.format(ex),
)
return redirect(
reverse(
Expand All @@ -2349,12 +2344,18 @@ def delete(self, request, *args, **kwargs):
)
)
self.add_tl_event(obj, 'delete')
self.create_app_alerts(obj, 'delete', request.user)
self.create_app_alerts(obj, 'delete', self.request.user)
obj.delete()
messages.success(
request,
self.request,
'iRODS access ticket "{}" deleted.'.format(obj.get_display_name()),
)
return super().delete(request, *args, **kwargs)
return redirect(
reverse(
'samplesheets:irods_tickets',
kwargs={'project': self.object.get_project().sodar_uuid},
)
)


class IrodsDataRequestListView(
Expand Down

0 comments on commit 54d92e0

Please sign in to comment.