graphql-python/graphene
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene.git synced 2025-10-31 07:57:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improved app_label logic

Browse Source
This commit is contained in:
Syrus Akbary 2015-09-25 19:54:14 -07:00
parent 1ec2f5a4c3
commit e9cf8616ba
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphene/core/types.py
View File

@ -33,7 +33,12 @@ class ObjectTypeMeta(type):
meta = attr_meta meta = attr_meta
base_meta = getattr(new_class, '_meta', None) base_meta = getattr(new_class, '_meta', None)
new_class.add_to_class('_meta', Options(meta, module)) if '.' in module:
app_label, _ = module.rsplit('.', 1)
else:
app_label = module
new_class.add_to_class('_meta', Options(meta, app_label))
if base_meta and base_meta.proxy: if base_meta and base_meta.proxy:
new_class._meta.interface = base_meta.interface new_class._meta.interface = base_meta.interface
# Add all attributes to the class. # Add all attributes to the class.

4
graphene/core/utils.py
View File

@ -24,12 +24,12 @@ def get_registered_object_type(name, object_type=None):
object_type_name = name object_type_name = name
if '.' in name: if '.' in name:
app_label, object_type_name = name.split('.', 1) app_label, object_type_name = name.rsplit('.', 1)
elif object_type: elif object_type:
app_label = object_type._meta.app_label app_label = object_type._meta.app_label
# Filter all registered object types which have the same name # Filter all registered object types which have the same name
ots = [ot for ot in registered_object_types if ot._meta.type_name == name] ots = [ot for ot in registered_object_types if ot._meta.type_name == object_type_name]
# If the list have more than one object type with the name, filter by # If the list have more than one object type with the name, filter by
# the app_label # the app_label
if len(ots)>1 and app_label: if len(ots)>1 and app_label: