mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Removed some unnecessary __exact operators in filters.

Browse Source
This commit is contained in:
Tim Graham
2014-01-17 17:27:04 -05:00
parent 298a2b577f
commit b87c59b04b
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/options.py
View File

@@ -1620,7 +1620,7 @@ class ModelAdmin(BaseModelAdmin):
app_label = opts.app_label
action_list = LogEntry.objects.filter(
object_id=unquote(object_id),
content_type__id__exact=ContentType.objects.get_for_model(model).id
content_type=ContentType.objects.get_for_model(model)
).select_related().order_by('action_time')
context = dict(self.admin_site.each_context(),

2
django/contrib/admin/templatetags/log.py
View File

@@ -18,7 +18,7 @@ class AdminLogNode(template.Node):
user_id = self.user
if not user_id.isdigit():
user_id = context[self.user].pk
context[self.varname] = LogEntry.objects.filter(user__pk__exact=user_id).select_related('content_type', 'user')[:int(self.limit)]
context[self.varname] = LogEntry.objects.filter(user__pk=user_id).select_related('content_type', 'user')[:int(self.limit)]
return ''

2
django/contrib/contenttypes/generic.py
View File

@@ -324,7 +324,7 @@ def create_generic_related_manager(superclass):
self.pk_val = self.instance._get_pk_val()
self.core_filters = {
'%s__pk' % content_type_field_name: content_type.id,
'%s__exact' % object_id_field_name: instance._get_pk_val(),
'%s' % object_id_field_name: instance._get_pk_val(),
}
def __call__(self, **kwargs):

4
django/contrib/flatpages/views.py
View File

@@ -35,12 +35,12 @@ def flatpage(request, url):
site_id = get_current_site(request).id
try:
f = get_object_or_404(FlatPage,
url__exact=url, sites__id__exact=site_id)
url=url, sites=site_id)
except Http404:
if not url.endswith('/') and settings.APPEND_SLASH:
url += '/'
f = get_object_or_404(FlatPage,
url__exact=url, sites__id__exact=site_id)
url=url, sites=site_id)
return HttpResponsePermanentRedirect('%s/' % request.path)
else:
raise

2
django/contrib/sites/managers.py
View File

@@ -39,4 +39,4 @@ class CurrentSiteManager(models.Manager):
def get_queryset(self):
if not self.__is_validated:
self._validate_field_name()
return super(CurrentSiteManager, self).get_queryset().filter(**{self.__field_name + '__id__exact': settings.SITE_ID})
return super(CurrentSiteManager, self).get_queryset().filter(**{self.__field_name + '__id': settings.SITE_ID})