Skip to content

Commit

Permalink
Merge pull request #976 from TOMToolkit/975-targetlists-broken-with-c…
Browse files Browse the repository at this point in the history
…ustom-user-model

975 targetlists broken with custom user model
  • Loading branch information
jchate6 committed Jul 3, 2024
2 parents 7785817 + 9ea42db commit e03c243
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/targets/target_fields.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ following command:

.. code:: python
./manage.py makemigrations
./manage.py makemigrations custom_code
This will create a migration file in the ``migrations`` directory of your custom app. You can then apply the migration
by running:
Expand Down
10 changes: 5 additions & 5 deletions tom_targets/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ def post(self, request, *args, **kwargs):
except Exception as e:
messages.error(request, 'Cannot find the target group with id={}; {}'.format(grouping_id, e))
return redirect(reverse('tom_targets:list') + '?' + query_string)
if not request.user.has_perm(f'{Target._meta.app_label}.view_targetlist', grouping_object):
if not request.user.has_perm('tom_targets.view_targetlist', grouping_object):
messages.error(request, 'Permission denied.')
return redirect(reverse('tom_targets:list') + '?' + query_string)

Expand Down Expand Up @@ -612,7 +612,7 @@ class TargetGroupingView(PermissionListMixin, ListView):
"""
View that handles the display of ``TargetList`` objects, also known as target groups. Requires authorization.
"""
permission_required = f'{Target._meta.app_label}.view_targetlist'
permission_required = 'tom_targets.view_targetlist'
template_name = 'tom_targets/target_grouping.html'
model = TargetList
paginate_by = 25
Expand Down Expand Up @@ -654,9 +654,9 @@ def form_valid(self, form):
"""
obj = form.save(commit=False)
obj.save()
assign_perm(f'{Target._meta.app_label}.view_targetlist', self.request.user, obj)
assign_perm(f'{Target._meta.app_label}.change_targetlist', self.request.user, obj)
assign_perm(f'{Target._meta.app_label}.delete_targetlist', self.request.user, obj)
assign_perm('tom_targets.view_targetlist', self.request.user, obj)
assign_perm('tom_targets.change_targetlist', self.request.user, obj)
assign_perm('tom_targets.delete_targetlist', self.request.user, obj)
return super().form_valid(form)


Expand Down

0 comments on commit e03c243

Please sign in to comment.