Fossil SCM

Fix redirect after ticket submission, as suggested by Justin Forest. Rename "ticket-change" to "xfer-ticket-script" everywhere

jan.nijtmans 2013-10-13 10:06 UTC tkt-change-hook
Commit 26d6877ff637916620e3593a888fd2257ee46359
Parent a4327ba0b63e4e0…
4 files changed +1 -1 +1 -1 +4 -3 +1 -1
~ src/configure.c ~ src/manifest.c ~ src/tkt.c ~ src/xfersetup.c
M src/configure.c
+1 -1
--- src/configure.c
+++ src/configure.c
@@ -131,11 +131,11 @@
131131
 { "@shun", CONFIGSET_SHUN },
132132
133133
 { "xfer-common-script", CONFIGSET_XFER },
134134
 { "xfer-push-script", CONFIGSET_XFER },
135135
 { "xfer-commit-script", CONFIGSET_XFER },
136
- { "ticket-change", CONFIGSET_XFER },
136
+ { "xfer-ticket-script", CONFIGSET_XFER },
137137
138138
 };
139139
 static int iConfig = 0;
140140
141141
 /*
142142
--- src/configure.c
+++ src/configure.c
@@ -131,11 +131,11 @@
131 { "@shun", CONFIGSET_SHUN },
132
133 { "xfer-common-script", CONFIGSET_XFER },
134 { "xfer-push-script", CONFIGSET_XFER },
135 { "xfer-commit-script", CONFIGSET_XFER },
136 { "ticket-change", CONFIGSET_XFER },
137
138 };
139 static int iConfig = 0;
140
141 /*
142
--- src/configure.c
+++ src/configure.c
@@ -131,11 +131,11 @@
131 { "@shun", CONFIGSET_SHUN },
132
133 { "xfer-common-script", CONFIGSET_XFER },
134 { "xfer-push-script", CONFIGSET_XFER },
135 { "xfer-commit-script", CONFIGSET_XFER },
136 { "xfer-ticket-script", CONFIGSET_XFER },
137
138 };
139 static int iConfig = 0;
140
141 /*
142
M src/manifest.c
+1 -1
--- src/manifest.c
+++ src/manifest.c
@@ -1877,11 +1877,11 @@
18771877
 }
18781878
 }
18791879
 if( p->type==CFTYPE_TICKET ){
18801880
 char *zTag;
18811881
1882
- hook = "ticket-change";
1882
+ hook = "xfer-ticket-script";
18831883
 zUuid = p->zTicketUuid;
18841884
 assert( manifest_crosslink_busy==1 );
18851885
 zTag = mprintf("tkt-%s", p->zTicketUuid);
18861886
 tag_insert(zTag, 1, 0, rid, p->rDate, rid);
18871887
 free(zTag);
18881888
--- src/manifest.c
+++ src/manifest.c
@@ -1877,11 +1877,11 @@
1877 }
1878 }
1879 if( p->type==CFTYPE_TICKET ){
1880 char *zTag;
1881
1882 hook = "ticket-change";
1883 zUuid = p->zTicketUuid;
1884 assert( manifest_crosslink_busy==1 );
1885 zTag = mprintf("tkt-%s", p->zTicketUuid);
1886 tag_insert(zTag, 1, 0, rid, p->rDate, rid);
1887 free(zTag);
1888
--- src/manifest.c
+++ src/manifest.c
@@ -1877,11 +1877,11 @@
1877 }
1878 }
1879 if( p->type==CFTYPE_TICKET ){
1880 char *zTag;
1881
1882 hook = "xfer-ticket-script";
1883 zUuid = p->zTicketUuid;
1884 assert( manifest_crosslink_busy==1 );
1885 zTag = mprintf("tkt-%s", p->zTicketUuid);
1886 tag_insert(zTag, 1, 0, rid, p->rDate, rid);
1887 free(zTag);
1888
M src/tkt.c
+4 -3
--- src/tkt.c
+++ src/tkt.c
@@ -612,19 +612,20 @@
612612
 /* If called from /debug_tktnew or /debug_tktedit... */
613613
 @ <font color="blue">
614614
 @ <p>Ticket artifact that would have been submitted:</p>
615615
 @ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
616616
 @ <hr /></font>
617
+ return TH_OK;
617618
 }else if( g.thTrace ){
618619
 Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
619620
 "}<br />\n",
620621
 blob_str(&tktchng));
621622
 }else{
622623
 ticket_put(&tktchng, zUuid,
623624
 (g.perm.ModTkt==0 && db_get_boolean("modreq-tkt",0)==1));
624625
 }
625
- return TH_OK;
626
+ return TH_RETURN;
626627
 }
627628
628629
629630
 /*
630631
 ** WEBPAGE: tktnew
@@ -672,11 +673,11 @@
672673
 captcha_generate(0);
673674
 @ </form>
674675
 if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
675676
 style_footer();
676677
 run_common_script();
677
- run_script("ticket-change", zNewUuid);
678
+ run_script("xfer-ticket-script", zNewUuid);
678679
 }
679680
680681
 /*
681682
 ** WEBPAGE: tktedit
682683
 ** WEBPAGE: debug_tktedit
@@ -742,11 +743,11 @@
742743
 captcha_generate(0);
743744
 @ </form>
744745
 if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
745746
 style_footer();
746747
 run_common_script();
747
- run_script("ticket-change", zName);
748
+ run_script("xfer-ticket-script", zName);
748749
 }
749750
750751
 /*
751752
 ** Check the ticket table schema in zSchema to see if it appears to
752753
 ** be well-formed. If everything is OK, return NULL. If something is
753754
--- src/tkt.c
+++ src/tkt.c
@@ -612,19 +612,20 @@
612 /* If called from /debug_tktnew or /debug_tktedit... */
613 @ <font color="blue">
614 @ <p>Ticket artifact that would have been submitted:</p>
615 @ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
616 @ <hr /></font>
 
617 }else if( g.thTrace ){
618 Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
619 "}<br />\n",
620 blob_str(&tktchng));
621 }else{
622 ticket_put(&tktchng, zUuid,
623 (g.perm.ModTkt==0 && db_get_boolean("modreq-tkt",0)==1));
624 }
625 return TH_OK;
626 }
627
628
629 /*
630 ** WEBPAGE: tktnew
@@ -672,11 +673,11 @@
672 captcha_generate(0);
673 @ </form>
674 if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
675 style_footer();
676 run_common_script();
677 run_script("ticket-change", zNewUuid);
678 }
679
680 /*
681 ** WEBPAGE: tktedit
682 ** WEBPAGE: debug_tktedit
@@ -742,11 +743,11 @@
742 captcha_generate(0);
743 @ </form>
744 if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
745 style_footer();
746 run_common_script();
747 run_script("ticket-change", zName);
748 }
749
750 /*
751 ** Check the ticket table schema in zSchema to see if it appears to
752 ** be well-formed. If everything is OK, return NULL. If something is
753
--- src/tkt.c
+++ src/tkt.c
@@ -612,19 +612,20 @@
612 /* If called from /debug_tktnew or /debug_tktedit... */
613 @ <font color="blue">
614 @ <p>Ticket artifact that would have been submitted:</p>
615 @ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
616 @ <hr /></font>
617 return TH_OK;
618 }else if( g.thTrace ){
619 Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
620 "}<br />\n",
621 blob_str(&tktchng));
622 }else{
623 ticket_put(&tktchng, zUuid,
624 (g.perm.ModTkt==0 && db_get_boolean("modreq-tkt",0)==1));
625 }
626 return TH_RETURN;
627 }
628
629
630 /*
631 ** WEBPAGE: tktnew
@@ -672,11 +673,11 @@
673 captcha_generate(0);
674 @ </form>
675 if( g.thTrace ) Th_Trace("END_TKTVIEW<br />\n", -1);
676 style_footer();
677 run_common_script();
678 run_script("xfer-ticket-script", zNewUuid);
679 }
680
681 /*
682 ** WEBPAGE: tktedit
683 ** WEBPAGE: debug_tktedit
@@ -742,11 +743,11 @@
743 captcha_generate(0);
744 @ </form>
745 if( g.thTrace ) Th_Trace("BEGIN_TKTEDIT<br />\n", -1);
746 style_footer();
747 run_common_script();
748 run_script("xfer-ticket-script", zName);
749 }
750
751 /*
752 ** Check the ticket table schema in zSchema to see if it appears to
753 ** be well-formed. If everything is OK, return NULL. If something is
754
M src/xfersetup.c
+1 -1
--- src/xfersetup.c
+++ src/xfersetup.c
@@ -180,11 +180,11 @@
180180
 static const char zDesc[] =
181181
 @ Enter TH1 script that runs for each "ticket" change in a transfer requests.
182182
 ;
183183
 xfersetup_generic(
184184
 "Transfer Ticket Script",
185
- "ticket-change",
185
+ "xfer-ticket-script",
186186
 zDefaultXferTicket,
187187
 zDesc,
188188
 0,
189189
 0,
190190
 30
191191
--- src/xfersetup.c
+++ src/xfersetup.c
@@ -180,11 +180,11 @@
180 static const char zDesc[] =
181 @ Enter TH1 script that runs for each "ticket" change in a transfer requests.
182 ;
183 xfersetup_generic(
184 "Transfer Ticket Script",
185 "ticket-change",
186 zDefaultXferTicket,
187 zDesc,
188 0,
189 0,
190 30
191
--- src/xfersetup.c
+++ src/xfersetup.c
@@ -180,11 +180,11 @@
180 static const char zDesc[] =
181 @ Enter TH1 script that runs for each "ticket" change in a transfer requests.
182 ;
183 xfersetup_generic(
184 "Transfer Ticket Script",
185 "xfer-ticket-script",
186 zDefaultXferTicket,
187 zDesc,
188 0,
189 0,
190 30
191

Keyboard Shortcuts

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