Commit 5c1387c5 authored by cvs2svn's avatar cvs2svn

This commit was manufactured by cvs2svn to create tag 'v3-4-1-0-3'.

Sprout from master 2010-06-11 17:41:43 UTC Frank Bergmann  <frank.bergmann@project-open.com> '- updated ticket table definition'
Cherrypick from master 2010-03-10 12:18:39 UTC Frank Bergmann  <frank.bergmann@project-open.com> '- added im_profile_helpdesk':
    www/new.tcl
parent 580b511b
......@@ -64,12 +64,7 @@ if {![info exists task]} {
# Don't show this page in WF panel.
# Instead, redirect to this same page, but in TaskViewPage mode.
# ad_returnredirect "/intranet-helpdesk/new?ticket_id=$task(object_id)"
# fraber 20100602: redirecting to return_url leads to an infinite
# loop with workflow. Re-activating redirection to the TicketNewPage
# ad_returnredirect $return_url
ad_returnredirect [export_vars -base "/intranet-helpdesk/new" { {ticket_id $task(object_id)} {form_mode display}} ]
ad_returnredirect $return_url
}
......@@ -99,19 +94,7 @@ set view_tickets_all_p [im_permission $current_user_id "view_tickets_all"]
set page_title [lang::message::lookup "" intranet-helpdesk.New_Ticket "New Ticket"]
if {[exists_and_not_null ticket_id]} {
# Set a suitable page title
set page_title [db_string title "select project_name from im_projects where project_id = :ticket_id" -default ""]
# Check if the ticket exists...
set ticket_count [db_string ticket_count "select count(*) from im_tickets where ticket_id = :ticket_id"]
if {0 == $ticket_count} {
ad_return_complaint 1 "<b>[lang::message::lookup "" intranet-helpdesk.No_Ticket_Found "No Ticket Found"]</b>:<br>
[lang::message::lookup "" intranet-helpdesk.No_Ticket_Found_Message "You are trying to access a ticket that has
been deleted from the database ('nuked')."]"
ad_script_abort
}
}
if {"" == $page_title && 0 != $ticket_type_id} {
set ticket_type [im_category_from_id $ticket_type_id]
......
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