Commit c25ecf90 authored by Project Open's avatar Project Open

- Fixed sorting using sort_order with -integer

parent c5d610fe
...@@ -657,8 +657,8 @@ set child_project_sql " ...@@ -657,8 +657,8 @@ set child_project_sql "
# of "parent" of any depth. # of "parent" of any depth.
# #
set sort_integer 0 set sort_integer_p 0
set sort_legacy 0 set sort_legacy_p 0
switch $list_sort_order { switch $list_sort_order {
nr { nr {
set sort_order "lower(children.project_nr)" set sort_order "lower(children.project_nr)"
...@@ -668,11 +668,11 @@ switch $list_sort_order { ...@@ -668,11 +668,11 @@ switch $list_sort_order {
} }
order { order {
set sort_order "children.sort_order" set sort_order "children.sort_order"
set sort_integer 1 set sort_integer_p 1
} }
legacy { legacy {
set sort_order "children.tree_sortkey" set sort_order "children.tree_sortkey"
set sort_legacy 1 set sort_legacy_p 1
} }
default { default {
set sort_order "lower(children.project_nr)" set sort_order "lower(children.project_nr)"
...@@ -901,8 +901,13 @@ set js_obj_list "[string range $js_obj_list 0 end-2]\];" ...@@ -901,8 +901,13 @@ set js_obj_list "[string range $js_obj_list 0 end-2]\];"
db_multirow hours_multirow hours_timesheet $sql db_multirow hours_multirow hours_timesheet $sql
# Sort the tree according to the specified sort order # Sort the tree according to the specified sort order
multirow_sort_tree hours_multirow project_id parent_id sort_order if {$sort_integer_p} {
multirow_sort_tree -integer hours_multirow project_id parent_id sort_order
} else {
multirow_sort_tree hours_multirow project_id parent_id sort_order
}
# --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment