Skip to content

Commit

Permalink
fixed delete translition in django trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
fivethreeo committed Feb 3, 2011
1 parent c631868 commit 8d10ac6
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions cms/admin/pageadmin.py
Original file line number Diff line number Diff line change
Expand Up @@ -966,9 +966,13 @@ def delete_translation(self, request, object_id, extra_context=None):

titleobj = get_object_or_404(Title, page__id=object_id, language=language)
plugins = CMSPlugin.objects.filter(placeholder__page__id=object_id, language=language)

deleted_objects, perms_needed = get_deleted_objects([titleobj], titleopts, request.user, self.admin_site)
to_delete_plugins, perms_needed_plugins = get_deleted_objects(plugins, pluginopts, request.user, self.admin_site)
using = []
if router:
using = [router.db_for_read(self.model)]
ret = get_deleted_objects([titleobj], titleopts, request.user, self.admin_site, *using)
deleted_objects, perms_needed = ret[0], ret[1]
ret = get_deleted_objects(plugins, pluginopts, request.user, self.admin_site, *using)
to_delete_plugins, perms_needed_plugins = ret[0], ret[1]
deleted_objects.append(to_delete_plugins)
perms_needed = set( list(perms_needed) + list(perms_needed_plugins) )

Expand Down

0 comments on commit 8d10ac6

Please sign in to comment.