revert

simonLeary42 · simonLeary42 · commit 0219eece4985 · 2025-10-05T17:32:42.000Z
diff --git a/coldfront/config/core.py b/coldfront/config/core.py
@@ -45,6 +45,7 @@
 ALLOCATION_FUNCS_ON_EXPIRE = [
     "coldfront.core.allocation.utils.test_allocation_function",
 ]
+ALLOCATION_RESOURCE_ORDERING = ENV.list("ALLOCATION_RESOURCE_ORDERING", default=["-is_allocatable", "name"])
 
 # This is in days
 ALLOCATION_DEFAULT_ALLOCATION_LENGTH = ENV.int("ALLOCATION_DEFAULT_ALLOCATION_LENGTH", default=365)
diff --git a/coldfront/core/allocation/models.py b/coldfront/core/allocation/models.py
@@ -25,7 +25,7 @@
 
 ALLOCATION_ATTRIBUTE_VIEW_LIST = import_from_settings("ALLOCATION_ATTRIBUTE_VIEW_LIST", [])
 ALLOCATION_FUNCS_ON_EXPIRE = import_from_settings("ALLOCATION_FUNCS_ON_EXPIRE", [])
-ALLOCATION_RESOURCE_ORDERING = import_from_settings("ALLOCATION_RESOURCE_ORDERING", ["-is_allocatable", "name"])
+ALLOCATION_RESOURCE_ORDERING = import_from_settings("ALLOCATION_RESOURCE_ORDERING")
 
 
 class AllocationPermission(Enum):

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`ALLOCATION_FUNCS_ON_EXPIRE = [`
`46`	`46`	`"coldfront.core.allocation.utils.test_allocation_function",`
`47`	`47`	`]`
	`48`	`+ALLOCATION_RESOURCE_ORDERING = ENV.list("ALLOCATION_RESOURCE_ORDERING", default=["-is_allocatable", "name"])`
`48`	`49`
`49`	`50`	`# This is in days`
`50`	`51`	`ALLOCATION_DEFAULT_ALLOCATION_LENGTH = ENV.int("ALLOCATION_DEFAULT_ALLOCATION_LENGTH", default=365)`