SHA1 Hash:	27d2e6e458351e17c50e654a2a1138b4afdf1b1a
Date:	2008-05-28 19:24:58
User:	drh
Comment:	More ticket processing refinements.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/configure.c from [ebeebd8a01] to [fa0c2531fc].

@@ -75,10 +75,12 @@
   { "ticket-table",          CONFIGSET_TKT  },
   { "ticket-common",         CONFIGSET_TKT  },
   { "ticket-newpage",        CONFIGSET_TKT  },
   { "ticket-viewpage",       CONFIGSET_TKT  },
   { "ticket-editpage",       CONFIGSET_TKT  },
+  { "ticket-report-template", CONFIGSET_TKT },
+  { "ticket-key-template",    CONFIGSET_TKT },
 };
 static int iConfig = 0;
 
 /*
 ** Return name of first configuration property matching the given mask.

Modified src/tkt.c from [0ee8650d53] to [486a2a67ca].

@@ -436,10 +436,13 @@
   const char *zScript;
   char *zNewUuid = 0;
 
   login_check_credentials();
   if( !g.okNewTkt ){ login_needed(); return; }
+  if( P("cancel") ){
+    cgi_redirect("home");
+  }
   style_header("New Ticket");
   ticket_init();
   getAllTicketFields();
   initializeVariablesFromDb();
   initializeVariablesFromCGI();
@@ -474,12 +477,15 @@
   const char *zName;
   int nRec;
 
   login_check_credentials();
   if( !g.okApndTkt && !g.okWrTkt ){ login_needed(); return; }
-  style_header("Edit Ticket");
   zName = P("name");
+  if( P("cancel") ){
+    cgi_redirectf("tktview?name=%T", zName);
+  }
+  style_header("Edit Ticket");
   if( zName==0 || (nName = strlen(zName))<4 || nName>UUID_SIZE
           || !validate16(zName,nName) ){
     @ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font>
     style_footer();
     return;

Modified src/tktsetup.c from [05495fef8d] to [fa060a4666].

@@ -309,10 +309,16 @@
 @ <input type="submit" name="submit" value="Submit">
 @ </td>
 @ <td>After filling in the information above, press this button to create
 @ the new ticket</td>
 @ </tr>
+@ <tr>
+@ <td align="right">
+@ <input type="submit" name="cancel" value="Cancel">
+@ </td>
+@ <td>Abandon and forget this bug report</td>
+@ </tr>
 @ </table>
 ;
 
 /*
 ** Return the code used to generate the new ticket page
@@ -486,10 +492,11 @@
 @   <input type="submit" name="eallbtn" value="Edit All">
 @ <th1>enable_output 1</th1>
 @ </td></tr>
 @ <tr><td align="right"></td><td>
 @ <input type="submit" name="submit" value="Submit Changes">
+@ <input type="submit" name="cancel" value="Cancel">
 @ </td></tr>
 @ </table>
 ;
 
 /*