mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-05 00:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #24693 -- Added label and label_lower property to Model._meta

Browse source
This commit is contained in:
Luis Del Giudice 2015-04-26 17:05:50 -04:00 • committed by Markus Holtermann
parent 811d7870a5
commit 69ddc1b3da
10 changed files with 80 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

11
django/db/models/options.py
View file

@ -176,6 +176,14 @@ class Options(object):
m2m = link.is_relation and link.many_to_many
return link, model, direct, m2m
@property
def label(self):
return '%s.%s' % (self.app_label, self.object_name)
@property
def label_lower(self):
return '%s.%s' % (self.app_label, self.model_name)
@property
def app_config(self):
# Don't go through get_app_config to avoid triggering imports.
@ -377,7 +385,6 @@ class Options(object):
case insensitive, so we make sure we are case insensitive here.
"""
if self.swappable:
model_label = '%s.%s' % (self.app_label, self.model_name)
swapped_for = getattr(settings, self.swappable, None)
if swapped_for:
try:
@ -389,7 +396,7 @@ class Options(object):
# or as part of validation.
return swapped_for
if '%s.%s' % (swapped_label, swapped_object.lower()) not in (None, model_label):
if '%s.%s' % (swapped_label, swapped_object.lower()) not in (None, self.label_lower):
return swapped_for
return None