MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 12:49:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace usage of model._meta.get_all_field_names()

Browse Source 
This is deprecated in Django 1.8, removed in later Django releases.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2018-04-12 15:50:17 +12:00
parent 64b4a3daef
commit 095f4acd6f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layerindex/admin.py
View File

@ -89,7 +89,7 @@ class LayerUpdateAdmin(admin.ModelAdmin):
class RecipeAdmin(admin.ModelAdmin):
search_fields = ['filename', 'pn']
list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
readonly_fields = [fieldname for fieldname in Recipe._meta.get_all_field_names() if fieldname not in ['recipefiledependency', 'classicrecipe', 'packageconfig']]
readonly_fields = [f.name for f in Recipe._meta.get_fields() if f.name not in ['recipefiledependency', 'classicrecipe', 'packageconfig']]
def has_add_permission(self, request, obj=None):
return False
def has_delete_permission(self, request, obj=None):
@ -110,7 +110,7 @@ class DynamicBuildDepAdmin(admin.ModelAdmin):
class ClassicRecipeAdmin(admin.ModelAdmin):
search_fields = ['filename', 'pn']
list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
readonly_fields = [fieldname for fieldname in Recipe._meta.get_all_field_names() if fieldname not in ['recipefiledependency', 'packageconfig']]
readonly_fields = [f.name for f in ClassicRecipe._meta.get_fields() if f.name not in ['recipefiledependency', 'packageconfig']]
def has_add_permission(self, request, obj=None):
return False
def has_delete_permission(self, request, obj=None):
@ -119,7 +119,7 @@ class ClassicRecipeAdmin(admin.ModelAdmin):
class MachineAdmin(admin.ModelAdmin):
search_fields = ['name']
list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
readonly_fields = Machine._meta.get_all_field_names()
readonly_fields = [f.name for f in Machine._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
def has_delete_permission(self, request, obj=None):
@ -128,7 +128,7 @@ class MachineAdmin(admin.ModelAdmin):
class DistroAdmin(admin.ModelAdmin):
search_fields = ['name']
list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
readonly_fields = Distro._meta.get_all_field_names()
readonly_fields = [f.name for f in Distro._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
def has_delete_permission(self, request, obj=None):
@ -138,7 +138,7 @@ class DistroAdmin(admin.ModelAdmin):
class BBAppendAdmin(admin.ModelAdmin):
search_fields = ['filename']
list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
readonly_fields = BBAppend._meta.get_all_field_names()
readonly_fields = [f.name for f in BBAppend._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
def has_delete_permission(self, request, obj=None):
@ -147,7 +147,7 @@ class BBAppendAdmin(admin.ModelAdmin):
class BBClassAdmin(admin.ModelAdmin):
search_fields = ['name']
list_filter = ['layerbranch__layer__name', 'layerbranch__branch__name']
readonly_fields = BBClass._meta.get_all_field_names()
readonly_fields = [f.name for f in BBClass._meta.get_fields()]
def has_add_permission(self, request, obj=None):
return False
def has_delete_permission(self, request, obj=None):

2
layerindex/querysethelper.py
View File

@ -71,7 +71,7 @@ def _validate_input(input, model):
return None, invalid + str(input_list)
# Check we are looking for a valid field
valid_fields = model._meta.get_all_field_names()
valid_fields = [f.name for f in model._meta.get_fields()]
for field in input_list[0].split(VALUE_SEPARATOR):
if not functools.reduce(lambda x, y: x or y, map(lambda x: field.startswith(x), [ x for x in valid_fields ])):
return None, (field, [ x for x in valid_fields ])