mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-19 02:54:38 +00:00
MVC/field types, add sorting for list types. closes https://github.com/opnsense/core/issues/3251
We should refactor some code later, but there's no rush. issue in https://github.com/opnsense/core/issues/3252
This commit is contained in:
parent
8170be76e6
commit
560a6cb79e
@ -79,6 +79,7 @@ class AuthGroupField extends BaseField
|
||||
foreach ($cnf->system->group as $group) {
|
||||
self::$internalOptionList[(string)$group->gid] = (string)$group->name;
|
||||
}
|
||||
natcasesort(self::$internalOptionList);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -104,7 +105,6 @@ class AuthGroupField extends BaseField
|
||||
}
|
||||
$result[$optKey] = array("value" => $optValue, "selected" => $selected);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
@ -101,6 +101,7 @@ class AuthenticationServerField extends BaseField
|
||||
self::$internalOptionList[$this->internalCacheKey][$key] = $key;
|
||||
}
|
||||
}
|
||||
natcasesort(self::$internalOptionList[$this->internalCacheKey]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -104,6 +104,7 @@ class CertificateField extends BaseField
|
||||
foreach ($configObj->{$this->certificateType} as $cert) {
|
||||
self::$internalOptionList[$this->certificateType][(string)$cert->refid] = (string)$cert->descr;
|
||||
}
|
||||
natcasesort(self::$internalOptionList[$this->certificateType]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -110,6 +110,7 @@ class ConfigdActionsField extends BaseField
|
||||
}
|
||||
}
|
||||
}
|
||||
natcasesort(self::$internalOptionList[$this->internalCacheKey]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -82,6 +82,7 @@ class CountryField extends BaseField
|
||||
}
|
||||
}
|
||||
}
|
||||
natcasesort(self::$internalOptionList);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -190,6 +190,7 @@ class InterfaceField extends BaseField
|
||||
!empty($value->descr) ? (string)$value->descr : strtoupper($key);
|
||||
}
|
||||
}
|
||||
natcasesort(self::$internalOptionList[$this->internalCacheKey]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -145,6 +145,10 @@ class ModelRelationField extends BaseField
|
||||
}
|
||||
unset($modelObj);
|
||||
}
|
||||
if (!$this->internalIsSorted) {
|
||||
natcasesort(self::$internalOptionList[$this->internalCacheKey]);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user