Merge branch 'master' of github.com:project-open/intranet-timesheet2-…

…tasks
cognovis · Nov 22, 2013 · 0d2836e · 0d2836e
2 parents e7a623b + a7c62cb
commit 0d2836e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/www/new.tcl b/www/new.tcl
@@ -247,8 +247,8 @@ im_dynfield::append_attributes_to_form \
 # Add two different Submit buttons
 if {"display" != $form_mode} {
     ad_form -extend -name task -form {
-	{submit_continue_tasklist:text(submit) {label "[lang::message::lookup {} intranet-timesheet2-tasks.Submit_return_to_task_list {Submit and enter the next task}]" }}
-	{submit_continue_edit:text(submit) {label "[lang::message::lookup {} intranet-timesheet2-tasks.Submit_continue_to_edit_task {Submit and edit the new task}]" }}
+	{submit_continue_tasklist:text(submit) {label "[lang::message::lookup {} intranet-timesheet2-tasks.Submit_return_to_task_list {Submit and return to main project}]" }}
+	{submit_continue_edit:text(submit) {label "[lang::message::lookup {} intranet-timesheet2-tasks.Submit_continue_to_edit_task {Submit and continue to work with task}]" }}
 	{submit_cancel:text(submit) {label "[lang::message::lookup {} intranet-timesheet2-tasks.Cancel Cancel]" }}
     }
 }

diff --git a/www/report-timesheet.tcl b/www/report-timesheet.tcl
@@ -52,8 +52,7 @@ if {[db_0or1row report_info "
 
     set start_date "2000-01-01"
     set end_date "2099-12-31"
-    set lod 99
-    ad_returnredirect [export_vars -base $url { start_date end_date { project_id $project_id } { task_id $task_id} { level_of_detail $lod } { return_url $return_url } }]
+    ad_returnredirect [export_vars -base $url { start_date end_date { project_id $project_id } { task_id $task_id} { return_url $return_url } }]
     return
 
 }