diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-10-06 20:17:42 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-10-06 20:17:42 -0500 |
| commit | f27e48e51e2154468d960f1be656538373332ee5 (patch) | |
| tree | 4d5913ab99b882966d95ccacda923a72a6d658e2 | |
| parent | 2b500be7e787a54eb005caa274406957728d8b1b (diff) | |
RT#38481: installer scheduling: redirect to basics (custom field edit) page instead of ticket view
| -rw-r--r-- | httemplate/elements/schedule-appointment.html | 3 | ||||
| -rw-r--r-- | rt/share/html/Elements/CalendarSlotSchedule | 4 | ||||
| -rw-r--r-- | rt/share/html/Search/Schedule.html | 1 | ||||
| -rwxr-xr-x | rt/share/html/Ticket/Display.html | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/httemplate/elements/schedule-appointment.html b/httemplate/elements/schedule-appointment.html index 45a8a5bab..69b9f422b 100644 --- a/httemplate/elements/schedule-appointment.html +++ b/httemplate/elements/schedule-appointment.html @@ -12,7 +12,8 @@ my $custnum = encode_entities( $cgi->param('custnum') ); my $query = join('&', map "username=$_", @username). "&LengthMin=$LengthMin". - "&custnum=$custnum"; + "&custnum=$custnum". + "&RedirectToBasics=1"; #XXX '&pkgnum=$pkgnum";need to be for specific package/location, not just for a customer... default to active(/ordered) package in a pkg_class w/ticketing_queueid, otherwise, a popup? we're getting complicated like form-creat_ticket.html my $url = $p. 'rt/Search/Schedule.html?'. $query; diff --git a/rt/share/html/Elements/CalendarSlotSchedule b/rt/share/html/Elements/CalendarSlotSchedule index 632fabba3..251347148 100644 --- a/rt/share/html/Elements/CalendarSlotSchedule +++ b/rt/share/html/Elements/CalendarSlotSchedule @@ -9,6 +9,7 @@ $LengthMin => $default_timestep $custnum => undef $pkgnum => undef + $RedirectToBasics => 0 </%ARGS> % foreach my $username ( @username ) { % @@ -110,7 +111,8 @@ % '&Starts='. $Date->strftime('%F').'%20'. $Starts. % '&Due='. $Date->strftime('%F').'%20'. $Due. % '&new-MemberOf='. $member. #XXX uri_escape? -% '&Status=new'; +% '&Status=new'. +% '&RedirectToBasics='.$RedirectToBasics; % #'&Requestors='. #XXX Freeside customer requestor(s) (package? onmouseover = "boxon(this);" diff --git a/rt/share/html/Search/Schedule.html b/rt/share/html/Search/Schedule.html index 43680b47c..ccd844bf8 100644 --- a/rt/share/html/Search/Schedule.html +++ b/rt/share/html/Search/Schedule.html @@ -212,6 +212,7 @@ #oops, more freeside abstraction-leaking custnum => $ARGS{custnum}, pkgnum => $ARGS{pkgnum}, + RedirectToBasics => $ARGS{RedirectToBasics}, ], &> diff --git a/rt/share/html/Ticket/Display.html b/rt/share/html/Ticket/Display.html index 41684c5be..96a49d4e4 100755 --- a/rt/share/html/Ticket/Display.html +++ b/rt/share/html/Ticket/Display.html @@ -99,6 +99,7 @@ $id => undef $TicketObj => undef $ShowHeaders => 0 $ForceShowHistory => 0 +$RedirectToBasics => 0 </%ARGS> <%INIT> @@ -217,6 +218,7 @@ $m->callback( ); # This code does automatic redirection if any updates happen. +$m->notes('RedirectToBasics' => 1) if $RedirectToBasics; my $path = '/Ticket/'. ( $m->notes('RedirectToBasics') ? 'Modify.html' : 'Display.html' ); MaybeRedirectForResults( |