add QuickCreateLong option, part of merging spiritone RT changes

2 files changed, 12 insertions, 7 deletions

diff --git a/rt/etc/RT_SiteConfig.pm b/rt/etc/RT_SiteConfig.pm
index 56d7e26..5e3dc80 100644
--- a/rt/etc/RT_SiteConfig.pm
+++ b/rt/etc/RT_SiteConfig.pm
@@ -16,6 +16,10 @@
 
 #Set( $rtname, 'example.com');
 
+# These settings should have been inserted by the initial Freeside install.
+# Somtimes you may want to change domain, timezone, or freeside::URL later,
+# everything else should probably stay untouched.
+
 $RT::rtname = '%%%RT_DOMAIN%%%';
 $RT::Organization = '%%%RT_DOMAIN%%%';
 
@@ -28,15 +32,16 @@ $RT::WebExternalAuth = 1;
 $RT::WebFallbackToInternal = 1; #no
 $RT::WebExternalAuto = 1;
 
-$RT::MyTicketsLength = 10;
-
 $RT::URI::freeside::IntegrationType = 'Internal';
 $RT::URI::freeside::URL = '%%%FREESIDE_URL%%%';
 
 Set($DatabaseHost   , '');
 
-#perl 5.8.0 - 5.8.2 experiment
-#@EmailInputEncodings = qw(iso-8859-1 us-ascii utf-8); # unless (@EmailInputEncodings);
-#Set($EmailOutputEncoding , 'iso-8859-1');
+# These settings are user-editable.
+
+$RT::MyTicketsLength = 10;
+$RT::QuickCreateLong = 0; #set to true to cause quick ticket creation to
+                          #redirect to the "long" ticket creation screen
+                          #instead of just creating a ticket with the subject.
 
 1;
diff --git a/rt/html/Elements/QuickCreate b/rt/html/Elements/QuickCreate
index 0d2489c..0b97121 100644
--- a/rt/html/Elements/QuickCreate
+++ b/rt/html/Elements/QuickCreate
@@ -44,12 +44,12 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <& /Elements/TitleBoxStart, title => loc('Quick ticket creation') &>
-<form method="post" action="<%$RT::WebPath%>/index.html">
+<form method="post" action="<%$RT::WebPath%>/<% $RT::QuickCreateLong ? 'Ticket/Create.html' : 'index.html' %>">
 <input type="hidden" name="QuickCreate" value="1">
 <table>
 <tr>
 <td>
-<font size="-2"><&|/l&>Subject</&>:<br><input size="15" name="Subject"></font>
+<font size="-2"><&|/l&>Subject</&>:<br><input size="30" name="Subject"></font>
 </td>
 <td>
 <font size="-2"><&|/l&>Queue</&>:<br><& /Elements/SelectQueue, Name => 'Queue', ShowNullOption => 0 &></font>