Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
1a37f39f
Commit
1a37f39f
authored
Nov 17, 2016
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(mvc) fix text sorting on array field, closes
https://github.com/opnsense/core/issues/1261
parent
3b73bd5d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
ArrayField.php
...se/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php
+7
-1
No files found.
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php
View file @
1a37f39f
...
...
@@ -146,7 +146,13 @@ class ArrayField extends BaseField
$sortKey
=
''
;
foreach
(
$fieldNames
as
$fieldName
)
{
if
(
array_key_exists
(
$fieldName
,
$node
->
internalChildnodes
))
{
$sortKey
.=
sprintf
(
"%"
.
$MAX_KEY_LENGTH
.
"s ,"
,
$node
->
$fieldName
);
if
(
is_numeric
((
string
)
$node
->
$fieldName
))
{
// align numeric values right for sorting, not perfect but works for integer type values
$sortKey
.=
sprintf
(
"%"
.
$MAX_KEY_LENGTH
.
"s,"
,
$node
->
$fieldName
);
}
else
{
// normal text sorting, align left
$sortKey
.=
sprintf
(
"%-"
.
$MAX_KEY_LENGTH
.
"s,"
,
$node
->
$fieldName
);
}
}
}
$sortKey
.=
$nodeKey
;
// prevent overwrite of duplicates
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment