Merge branch 'master' of https://gitlab.project-open.net/project-open/intranet-timesheet2

www/absences/new.tcl

@@ -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

@@ -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
+}
 
 # ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 #