[Rt-commit] rt branch, 4.0/no-ticket-interface-for-approvals, updated. rt-4.0.4-119-g48c9a7f

[Thomas Sibley]

The branch, 4.0/no-ticket-interface-for-approvals has been updated
       via  48c9a7fe135419b8cadaf95dc452e313fdedbf65 (commit)
      from  9e1b6081c0d5189f33f2e2af182e5a6eb90cd0d3 (commit)

Summary of changes:
 etc/RT_Config.pm.in            |   18 +++++++++++++-----
 share/html/Ticket/Display.html |    2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 48c9a7fe135419b8cadaf95dc452e313fdedbf65
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Dec 19 12:20:05 2011 -0500

    Rename option to ForceApprovalsView and clarify the doc

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index c4e7c85..8365952 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -1687,17 +1687,25 @@ Should rejection notes from approvals be sent to the requestors?
 
 Set($ApprovalRejectionNotes, 1);
 
-=item C<$NoTicketInterfaceForApprovals>
+=item C<$ForceApprovalsView>
 
-By default it's possible to view approvals like a regular tickets
-while they have its own UI. Set this option to 1 to redirect
-users to approvals specific UI.
+Should approval tickets only be viewed and modified through the standard
+approval interface?  Changing this setting to 1 will redirect any attempt to
+use the normal ticket display and modify page for approval tickets.
+
+For example, with this option set to 1 and an approval ticket #123:
+
+    /Ticket/Display.html?id=123
+
+is redirected to
+
+    /Approval/Display.html?id=123
 
 =back
 
 =cut
 
-Set($NoTicketInterfaceForApprovals, 0);
+Set($ForceApprovalsView, 0);
 
 =head1 Extra security
 
diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index 07d751c..0fc901b 100755
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -199,7 +199,7 @@ $m->callback(
 # This code does automatic redirection if any updates happen. 
 MaybeRedirectForResults(
     Actions   => \@Actions,
-    $TicketObj->Type eq 'approval' && RT->Config->Get('NoTicketInterfaceForApprovals')
+    $TicketObj->Type eq 'approval' && RT->Config->Get('ForceApprovalsView')
         ? (Path      => "/Approvals/Display.html", Force => 1)
         : (Path      => "/Ticket/Display.html")
     ,

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