Fossil SCM

More ticket processing refinements.

drh 2008-05-28 19:24 trunk
Commit 27d2e6e458351e17c50e654a2a1138b4afdf1b1a
Parent 49380d500a1259b…
3 files changed +2 +7 -1 +7
~ src/configure.c ~ src/tkt.c ~ src/tktsetup.c
M src/configure.c
+2
--- src/configure.c
+++ src/configure.c
@@ -75,10 +75,12 @@
7575
 { "ticket-table", CONFIGSET_TKT },
7676
 { "ticket-common", CONFIGSET_TKT },
7777
 { "ticket-newpage", CONFIGSET_TKT },
7878
 { "ticket-viewpage", CONFIGSET_TKT },
7979
 { "ticket-editpage", CONFIGSET_TKT },
80
+ { "ticket-report-template", CONFIGSET_TKT },
81
+ { "ticket-key-template", CONFIGSET_TKT },
8082
 };
8183
 static int iConfig = 0;
8284
8385
 /*
8486
 ** Return name of first configuration property matching the given mask.
8587
--- src/configure.c
+++ src/configure.c
@@ -75,10 +75,12 @@
75 { "ticket-table", CONFIGSET_TKT },
76 { "ticket-common", CONFIGSET_TKT },
77 { "ticket-newpage", CONFIGSET_TKT },
78 { "ticket-viewpage", CONFIGSET_TKT },
79 { "ticket-editpage", CONFIGSET_TKT },
 
 
80 };
81 static int iConfig = 0;
82
83 /*
84 ** Return name of first configuration property matching the given mask.
85
--- src/configure.c
+++ src/configure.c
@@ -75,10 +75,12 @@
75 { "ticket-table", CONFIGSET_TKT },
76 { "ticket-common", CONFIGSET_TKT },
77 { "ticket-newpage", CONFIGSET_TKT },
78 { "ticket-viewpage", CONFIGSET_TKT },
79 { "ticket-editpage", CONFIGSET_TKT },
80 { "ticket-report-template", CONFIGSET_TKT },
81 { "ticket-key-template", CONFIGSET_TKT },
82 };
83 static int iConfig = 0;
84
85 /*
86 ** Return name of first configuration property matching the given mask.
87
M src/tkt.c
+7 -1
--- src/tkt.c
+++ src/tkt.c
@@ -436,10 +436,13 @@
436436
 const char *zScript;
437437
 char *zNewUuid = 0;
438438
439439
 login_check_credentials();
440440
 if( !g.okNewTkt ){ login_needed(); return; }
441
+ if( P("cancel") ){
442
+ cgi_redirect("home");
443
+ }
441444
 style_header("New Ticket");
442445
 ticket_init();
443446
 getAllTicketFields();
444447
 initializeVariablesFromDb();
445448
 initializeVariablesFromCGI();
@@ -474,12 +477,15 @@
474477
 const char *zName;
475478
 int nRec;
476479
477480
 login_check_credentials();
478481
 if( !g.okApndTkt && !g.okWrTkt ){ login_needed(); return; }
479
- style_header("Edit Ticket");
480482
 zName = P("name");
483
+ if( P("cancel") ){
484
+ cgi_redirectf("tktview?name=%T", zName);
485
+ }
486
+ style_header("Edit Ticket");
481487
 if( zName==0 || (nName = strlen(zName))<4 || nName>UUID_SIZE
482488
 || !validate16(zName,nName) ){
483489
 @ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font>
484490
 style_footer();
485491
 return;
486492
--- src/tkt.c
+++ src/tkt.c
@@ -436,10 +436,13 @@
436 const char *zScript;
437 char *zNewUuid = 0;
438
439 login_check_credentials();
440 if( !g.okNewTkt ){ login_needed(); return; }
 
 
 
441 style_header("New Ticket");
442 ticket_init();
443 getAllTicketFields();
444 initializeVariablesFromDb();
445 initializeVariablesFromCGI();
@@ -474,12 +477,15 @@
474 const char *zName;
475 int nRec;
476
477 login_check_credentials();
478 if( !g.okApndTkt && !g.okWrTkt ){ login_needed(); return; }
479 style_header("Edit Ticket");
480 zName = P("name");
 
 
 
 
481 if( zName==0 || (nName = strlen(zName))<4 || nName>UUID_SIZE
482 || !validate16(zName,nName) ){
483 @ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font>
484 style_footer();
485 return;
486
--- src/tkt.c
+++ src/tkt.c
@@ -436,10 +436,13 @@
436 const char *zScript;
437 char *zNewUuid = 0;
438
439 login_check_credentials();
440 if( !g.okNewTkt ){ login_needed(); return; }
441 if( P("cancel") ){
442 cgi_redirect("home");
443 }
444 style_header("New Ticket");
445 ticket_init();
446 getAllTicketFields();
447 initializeVariablesFromDb();
448 initializeVariablesFromCGI();
@@ -474,12 +477,15 @@
477 const char *zName;
478 int nRec;
479
480 login_check_credentials();
481 if( !g.okApndTkt && !g.okWrTkt ){ login_needed(); return; }
 
482 zName = P("name");
483 if( P("cancel") ){
484 cgi_redirectf("tktview?name=%T", zName);
485 }
486 style_header("Edit Ticket");
487 if( zName==0 || (nName = strlen(zName))<4 || nName>UUID_SIZE
488 || !validate16(zName,nName) ){
489 @ <font color="red"><b>Not a valid ticket id: \"%h(zName)\"</b></font>
490 style_footer();
491 return;
492
M src/tktsetup.c
+7
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -309,10 +309,16 @@
309309
 @ <input type="submit" name="submit" value="Submit">
310310
 @ </td>
311311
 @ <td>After filling in the information above, press this button to create
312312
 @ the new ticket</td>
313313
 @ </tr>
314
+@ <tr>
315
+@ <td align="right">
316
+@ <input type="submit" name="cancel" value="Cancel">
317
+@ </td>
318
+@ <td>Abandon and forget this bug report</td>
319
+@ </tr>
314320
 @ </table>
315321
 ;
316322
317323
 /*
318324
 ** Return the code used to generate the new ticket page
@@ -486,10 +492,11 @@
486492
 @ <input type="submit" name="eallbtn" value="Edit All">
487493
 @ <th1>enable_output 1</th1>
488494
 @ </td></tr>
489495
 @ <tr><td align="right"></td><td>
490496
 @ <input type="submit" name="submit" value="Submit Changes">
497
+@ <input type="submit" name="cancel" value="Cancel">
491498
 @ </td></tr>
492499
 @ </table>
493500
 ;
494501
495502
 /*
496503
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -309,10 +309,16 @@
309 @ <input type="submit" name="submit" value="Submit">
310 @ </td>
311 @ <td>After filling in the information above, press this button to create
312 @ the new ticket</td>
313 @ </tr>
 
 
 
 
 
 
314 @ </table>
315 ;
316
317 /*
318 ** Return the code used to generate the new ticket page
@@ -486,10 +492,11 @@
486 @ <input type="submit" name="eallbtn" value="Edit All">
487 @ <th1>enable_output 1</th1>
488 @ </td></tr>
489 @ <tr><td align="right"></td><td>
490 @ <input type="submit" name="submit" value="Submit Changes">
 
491 @ </td></tr>
492 @ </table>
493 ;
494
495 /*
496
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -309,10 +309,16 @@
309 @ <input type="submit" name="submit" value="Submit">
310 @ </td>
311 @ <td>After filling in the information above, press this button to create
312 @ the new ticket</td>
313 @ </tr>
314 @ <tr>
315 @ <td align="right">
316 @ <input type="submit" name="cancel" value="Cancel">
317 @ </td>
318 @ <td>Abandon and forget this bug report</td>
319 @ </tr>
320 @ </table>
321 ;
322
323 /*
324 ** Return the code used to generate the new ticket page
@@ -486,10 +492,11 @@
492 @ <input type="submit" name="eallbtn" value="Edit All">
493 @ <th1>enable_output 1</th1>
494 @ </td></tr>
495 @ <tr><td align="right"></td><td>
496 @ <input type="submit" name="submit" value="Submit Changes">
497 @ <input type="submit" name="cancel" value="Cancel">
498 @ </td></tr>
499 @ </table>
500 ;
501
502 /*
503

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button