Skip to content

add interchangeable model keys support #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

add interchangeable model keys support #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions django_comments_xtd/api/frontend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.utils.module_loading import import_string

from django_comments.forms import CommentSecurityForm
from django_comments.utils import get_key_value
from rest_framework.response import Response
from rest_framework.reverse import reverse

Expand All @@ -25,7 +26,7 @@ class CommentBoxDriver(object):
def get_queryset(cls, ctype, obj, request):
return XtdComment.objects.filter(
content_type=ctype,
object_pk=obj.pk,
object_pk=get_key_value(obj),
site__pk=get_current_site_id(request),
is_public=True,
)
Expand Down Expand Up @@ -109,10 +110,10 @@ def get_props(cls, obj, user, request=None):
"flag_url": cls._reverse("comments-flag", args=(0,)),
"list_url": cls._reverse('comments-xtd-api-list',
kwargs={'content_type': ctype_slug,
'object_pk': obj.id}),
'object_pk': get_key_value(obj)}),
"count_url": cls._reverse('comments-xtd-api-count',
kwargs={'content_type': ctype_slug,
'object_pk': obj.id}),
'object_pk': get_key_value(obj)}),
"send_url": cls._reverse("comments-xtd-api-create"),
"preview_url": cls._reverse("comments-xtd-api-preview"),
"form": {
Expand Down
3 changes: 2 additions & 1 deletion django_comments_xtd/api/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from django_comments.forms import CommentSecurityForm
from django_comments.models import CommentFlag
from django_comments.signals import comment_will_be_posted, comment_was_posted
from django_comments.utils import get_key
from rest_framework import exceptions, serializers

from django_comments_xtd import get_model, signed, views
Expand Down Expand Up @@ -89,7 +90,7 @@ def validate(self, data):
"object_pk field.")
try:
model = apps.get_model(*ctype.split(".", 1))
target = model._default_manager.get(pk=object_pk)
target = model._default_manager.get(**{get_key(model): object_pk})
whocan = get_app_model_options(content_type=ctype)['who_can_post']
except (AttributeError, TypeError, LookupError):
raise serializers.ValidationError("Invalid content_type value: %r"
Expand Down
3 changes: 2 additions & 1 deletion django_comments_xtd/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from django.utils.translation import gettext_lazy as _

from django_comments.forms import CommentForm
from django_comments.utils import get_key

from django_comments_xtd.conf import settings
from django_comments_xtd.models import TmpXtdComment
Expand Down Expand Up @@ -60,7 +61,7 @@ def get_comment_create_data(self, site_id=None):
ctype = data.get('content_type')
object_pk = data.get('object_pk')
model = apps.get_model(ctype.app_label, ctype.model)
target = model._default_manager.get(pk=object_pk)
target = model._default_manager.get(**{get_key(model): object_pk})
data.update({'thread_id': 0, 'level': 0, 'order': 1,
'parent_id': self.cleaned_data['reply_to'],
'followup': self.cleaned_data['followup'],
Expand Down