[freeside-commits] branch FREESIDE_4_BRANCH updated. 9658877aaddc828d12556a060278f4e76bd3bf25

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  9658877aaddc828d12556a060278f4e76bd3bf25 (commit)
       via  34c1bd6f43bb6766614ddc6a7f6a86fe9c8a1e04 (commit)
      from  223427a8fb6ecf68e5edddc7af004fca59733166 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9658877aaddc828d12556a060278f4e76bd3bf25
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Fri Oct 9 23:00:05 2015 -0500

    RT#38481 [noted in FREESIDE_MODIFIED]

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index ace0d49..05ffb2a 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -165,3 +165,9 @@ share/html/Search/Elements/PickBasics
 lib/RT/CustomField.pm
 share/html/Admin/CustomFields/Modify.html
 share/html/Ticket/Create.html
+
+#allow RedirectToBasics to be set from schedule-appointments, RT#38481
+share/html/Search/Schedule.html
+share/html/Elements/CalendarSlotSchedule
+share/html/Ticket/Display.html
+

commit 34c1bd6f43bb6766614ddc6a7f6a86fe9c8a1e04
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Oct 6 20:17:42 2015 -0500

    RT#38481: installer scheduling: redirect to basics (custom field edit) page instead of ticket view

diff --git a/httemplate/elements/schedule-appointment.html b/httemplate/elements/schedule-appointment.html
index 45a8a5b..69b9f42 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 632fabb..2513471 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 43680b4..ccd844b 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 41684c5..96a49d4 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(

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/schedule-appointment.html |    3 ++-
 rt/FREESIDE_MODIFIED                          |    6 ++++++
 rt/share/html/Elements/CalendarSlotSchedule   |    4 +++-
 rt/share/html/Search/Schedule.html            |    1 +
 rt/share/html/Ticket/Display.html             |    2 ++
 5 files changed, 14 insertions(+), 2 deletions(-)