Merge pull request #16495 from edx/bmedx/django111_startup_fixes

Changes necessary for Django 1.11 tests to start
This commit is contained in:
Brian Mesick
2017-11-14 12:19:21 -05:00
committed by GitHub
23 changed files with 193 additions and 194 deletions

View File

@@ -116,9 +116,10 @@ class SAMLProviderDataAdmin(admin.ModelAdmin):
def get_readonly_fields(self, request, obj=None):
if obj: # editing an existing object
return self.model._meta.get_all_field_names() # pylint: disable=protected-access
return [field.name for field in self.model._meta.get_fields()] # pylint: disable=protected-access
return self.readonly_fields
admin.site.register(SAMLProviderData, SAMLProviderDataAdmin)