Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-timesheet2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
project-open
intranet-timesheet2
Commits
c25ecf90
Commit
c25ecf90
authored
Sep 06, 2021
by
Project Open
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed sorting using sort_order with -integer
parent
c5d610fe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
new.tcl
www/hours/new.tcl
+10
-5
No files found.
www/hours/new.tcl
View file @
c25ecf90
...
...
@@ -657,8 +657,8 @@ set child_project_sql "
# of "parent" of any depth.
#
set
sort_integer 0
set
sort_legacy 0
set
sort_integer
_p
0
set
sort_legacy
_p
0
switch
$list
_sort_order
{
nr
{
set sort_order
"lower(children.project_nr)"
...
...
@@ -668,11 +668,11 @@ switch $list_sort_order {
}
order
{
set sort_order
"children.sort_order"
set sort_integer 1
set sort_integer
_p
1
}
legacy
{
set sort_order
"children.tree_sortkey"
set sort_legacy 1
set sort_legacy
_p
1
}
default
{
set sort_order
"lower(children.project_nr)"
...
...
@@ -901,8 +901,13 @@ set js_obj_list "[string range $js_obj_list 0 end-2]\];"
db_multirow hours_multirow hours_timesheet
$sql
# 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
}
# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
#
...
...
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