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
ac0b7a75
Commit
ac0b7a75
authored
Sep 21, 2021
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.project-open.net/project-open/intranet-timesheet2
parents
632211d4
eff39abc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
new.tcl
www/absences/new.tcl
+3
-0
new.tcl
www/hours/new.tcl
+10
-5
No files found.
www/absences/new.tcl
View file @
ac0b7a75
...
...
@@ -50,6 +50,7 @@ set duration_default_uom [parameter::get_from_package_key -package_key "intranet
set
redirect_package_url
[
parameter::get_from_package_key -package_key
"intranet-timesheet2"
-parameter
"AbsenceRedirectPackageUrl"
-default
""
]
if
{
""
!=
$redirect
_package_url
}
{
ad_returnredirect
"
$redirect
_package_url/new"
ad_script_abort
}
...
...
@@ -137,6 +138,7 @@ if {"delete" == $button_pressed} {
ns_log Notice
"new: Nuked absence #
$absence
_id, about to return to return_url=
$return
_url"
ad_returnredirect
$return
_url
ad_script_abort
}
...
...
@@ -180,6 +182,7 @@ if {0 == $absence_type_id && ![info exists absence_id]} {
{
return_url
$current
_url
}
{
type_id_var
"absence_type_id"
}
}]
ad_script_abort
}
}
...
...
www/hours/new.tcl
View file @
ac0b7a75
...
...
@@ -661,8 +661,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)"
...
...
@@ -672,11 +672,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)"
...
...
@@ -905,8 +905,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