Fossil SCM

add back the original "ticket-change" hook, as it was in trunk

jan.nijtmans 2013-10-13 14:46 UTC tkt-change-hook
Commit abef3f19572202d9fbbbee7ff93bb88e881c2e97
Parent b6b656a0ec2fbf5…
4 files changed +1 +11 -1 +32 -1
~ src/configure.c ~ src/tkt.c ~ src/tktsetup.c ~ src/wiki.c
M src/configure.c
+1
--- src/configure.c
+++ src/configure.c
@@ -112,10 +112,11 @@
112112
 { "empty-dirs", CONFIGSET_PROJ },
113113
 { "allow-symlinks", CONFIGSET_PROJ },
114114
115115
 { "ticket-table", CONFIGSET_TKT },
116116
 { "ticket-common", CONFIGSET_TKT },
117
+ { "ticket-change", CONFIGSET_TKT },
117118
 { "ticket-newpage", CONFIGSET_TKT },
118119
 { "ticket-viewpage", CONFIGSET_TKT },
119120
 { "ticket-editpage", CONFIGSET_TKT },
120121
 { "ticket-reportlist", CONFIGSET_TKT },
121122
 { "ticket-report-template", CONFIGSET_TKT },
122123
--- src/configure.c
+++ src/configure.c
@@ -112,10 +112,11 @@
112 { "empty-dirs", CONFIGSET_PROJ },
113 { "allow-symlinks", CONFIGSET_PROJ },
114
115 { "ticket-table", CONFIGSET_TKT },
116 { "ticket-common", CONFIGSET_TKT },
 
117 { "ticket-newpage", CONFIGSET_TKT },
118 { "ticket-viewpage", CONFIGSET_TKT },
119 { "ticket-editpage", CONFIGSET_TKT },
120 { "ticket-reportlist", CONFIGSET_TKT },
121 { "ticket-report-template", CONFIGSET_TKT },
122
--- src/configure.c
+++ src/configure.c
@@ -112,10 +112,11 @@
112 { "empty-dirs", CONFIGSET_PROJ },
113 { "allow-symlinks", CONFIGSET_PROJ },
114
115 { "ticket-table", CONFIGSET_TKT },
116 { "ticket-common", CONFIGSET_TKT },
117 { "ticket-change", CONFIGSET_TKT },
118 { "ticket-newpage", CONFIGSET_TKT },
119 { "ticket-viewpage", CONFIGSET_TKT },
120 { "ticket-editpage", CONFIGSET_TKT },
121 { "ticket-reportlist", CONFIGSET_TKT },
122 { "ticket-report-template", CONFIGSET_TKT },
123
M src/tkt.c
+11 -1
--- src/tkt.c
+++ src/tkt.c
@@ -317,10 +317,20 @@
317317
 const char *zConfig;
318318
 Th_FossilInit(TH_INIT_DEFAULT);
319319
 zConfig = ticket_common_code();
320320
 Th_Eval(g.interp, 0, zConfig, -1);
321321
 }
322
+
323
+/*
324
+** Create the TH1 interpreter and load the "change" code.
325
+*/
326
+int ticket_change(void){
327
+ const char *zConfig;
328
+ Th_FossilInit(TH_INIT_DEFAULT);
329
+ zConfig = db_get("ticket-change", "return\n");
330
+ return Th_Eval(g.interp, 0, zConfig, -1);
331
+}
322332
323333
 /*
324334
 ** Recreate the TICKET and TICKETCHNG tables.
325335
 */
326336
 void ticket_create_table(int separateConnection){
@@ -621,11 +631,11 @@
621631
 blob_str(&tktchng));
622632
 }else{
623633
 ticket_put(&tktchng, zUuid,
624634
 (g.perm.ModTkt==0 && db_get_boolean("modreq-tkt",0)==1));
625635
 }
626
- return TH_RETURN;
636
+ return ticket_change();
627637
 }
628638
629639
630640
 /*
631641
 ** WEBPAGE: tktnew
632642
--- src/tkt.c
+++ src/tkt.c
@@ -317,10 +317,20 @@
317 const char *zConfig;
318 Th_FossilInit(TH_INIT_DEFAULT);
319 zConfig = ticket_common_code();
320 Th_Eval(g.interp, 0, zConfig, -1);
321 }
 
 
 
 
 
 
 
 
 
 
322
323 /*
324 ** Recreate the TICKET and TICKETCHNG tables.
325 */
326 void ticket_create_table(int separateConnection){
@@ -621,11 +631,11 @@
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
632
--- src/tkt.c
+++ src/tkt.c
@@ -317,10 +317,20 @@
317 const char *zConfig;
318 Th_FossilInit(TH_INIT_DEFAULT);
319 zConfig = ticket_common_code();
320 Th_Eval(g.interp, 0, zConfig, -1);
321 }
322
323 /*
324 ** Create the TH1 interpreter and load the "change" code.
325 */
326 int ticket_change(void){
327 const char *zConfig;
328 Th_FossilInit(TH_INIT_DEFAULT);
329 zConfig = db_get("ticket-change", "return\n");
330 return Th_Eval(g.interp, 0, zConfig, -1);
331 }
332
333 /*
334 ** Recreate the TICKET and TICKETCHNG tables.
335 */
336 void ticket_create_table(int separateConnection){
@@ -621,11 +631,11 @@
631 blob_str(&tktchng));
632 }else{
633 ticket_put(&tktchng, zUuid,
634 (g.perm.ModTkt==0 && db_get_boolean("modreq-tkt",0)==1));
635 }
636 return ticket_change();
637 }
638
639
640 /*
641 ** WEBPAGE: tktnew
642
M src/tktsetup.c
+32
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -38,10 +38,12 @@
3838
 "Specify the schema of the \"ticket\" table in the database.");
3939
 setup_menu_entry("Timeline", "tktsetup_timeline",
4040
 "How to display ticket status in the timeline");
4141
 setup_menu_entry("Common", "tktsetup_com",
4242
 "Common TH1 code run before all ticket processing.");
43
+ setup_menu_entry("Change", "tktsetup_change",
44
+ "The TH1 code run after a ticket is edited or created.");
4345
 setup_menu_entry("New Ticket Page", "tktsetup_newpage",
4446
 "HTML with embedded TH1 code for the \"new ticket\" webpage.");
4547
 setup_menu_entry("View Ticket Page", "tktsetup_viewpage",
4648
 "HTML with embedded TH1 code for the \"view ticket\" webpage.");
4749
 setup_menu_entry("Edit Ticket Page", "tktsetup_editpage",
@@ -251,10 +253,40 @@
251253
 "Ticket Common Script",
252254
 "ticket-common",
253255
 zDefaultTicketCommon,
254256
 zDesc,
255257
 0,
258
+ 0,
259
+ 30
260
+ );
261
+}
262
+
263
+static const char zDefaultTicketChange[] =
264
+@ return
265
+;
266
+
267
+/*
268
+** Return the ticket change code.
269
+*/
270
+const char *ticket_change_code(void){
271
+ return db_get("ticket-change", (char*)zDefaultTicketChange);
272
+}
273
+
274
+/*
275
+** WEBPAGE: tktsetup_change
276
+*/
277
+void tktsetup_change_page(void){
278
+ static const char zDesc[] =
279
+ @ Enter TH1 script that runs after processing the ticket editing
280
+ @ and creation pages.
281
+ ;
282
+ tktsetup_generic(
283
+ "Ticket Change Script",
284
+ "ticket-change",
285
+ zDefaultTicketChange,
286
+ zDesc,
287
+ 0,
256288
 0,
257289
 30
258290
 );
259291
 }
260292
261293
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -38,10 +38,12 @@
38 "Specify the schema of the \"ticket\" table in the database.");
39 setup_menu_entry("Timeline", "tktsetup_timeline",
40 "How to display ticket status in the timeline");
41 setup_menu_entry("Common", "tktsetup_com",
42 "Common TH1 code run before all ticket processing.");
 
 
43 setup_menu_entry("New Ticket Page", "tktsetup_newpage",
44 "HTML with embedded TH1 code for the \"new ticket\" webpage.");
45 setup_menu_entry("View Ticket Page", "tktsetup_viewpage",
46 "HTML with embedded TH1 code for the \"view ticket\" webpage.");
47 setup_menu_entry("Edit Ticket Page", "tktsetup_editpage",
@@ -251,10 +253,40 @@
251 "Ticket Common Script",
252 "ticket-common",
253 zDefaultTicketCommon,
254 zDesc,
255 0,
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
256 0,
257 30
258 );
259 }
260
261
--- src/tktsetup.c
+++ src/tktsetup.c
@@ -38,10 +38,12 @@
38 "Specify the schema of the \"ticket\" table in the database.");
39 setup_menu_entry("Timeline", "tktsetup_timeline",
40 "How to display ticket status in the timeline");
41 setup_menu_entry("Common", "tktsetup_com",
42 "Common TH1 code run before all ticket processing.");
43 setup_menu_entry("Change", "tktsetup_change",
44 "The TH1 code run after a ticket is edited or created.");
45 setup_menu_entry("New Ticket Page", "tktsetup_newpage",
46 "HTML with embedded TH1 code for the \"new ticket\" webpage.");
47 setup_menu_entry("View Ticket Page", "tktsetup_viewpage",
48 "HTML with embedded TH1 code for the \"view ticket\" webpage.");
49 setup_menu_entry("Edit Ticket Page", "tktsetup_editpage",
@@ -251,10 +253,40 @@
253 "Ticket Common Script",
254 "ticket-common",
255 zDefaultTicketCommon,
256 zDesc,
257 0,
258 0,
259 30
260 );
261 }
262
263 static const char zDefaultTicketChange[] =
264 @ return
265 ;
266
267 /*
268 ** Return the ticket change code.
269 */
270 const char *ticket_change_code(void){
271 return db_get("ticket-change", (char*)zDefaultTicketChange);
272 }
273
274 /*
275 ** WEBPAGE: tktsetup_change
276 */
277 void tktsetup_change_page(void){
278 static const char zDesc[] =
279 @ Enter TH1 script that runs after processing the ticket editing
280 @ and creation pages.
281 ;
282 tktsetup_generic(
283 "Ticket Change Script",
284 "ticket-change",
285 zDefaultTicketChange,
286 zDesc,
287 0,
288 0,
289 30
290 );
291 }
292
293
M src/wiki.c
-1
--- src/wiki.c
+++ src/wiki.c
@@ -294,11 +294,10 @@
294294
 moderation_table_create();
295295
 db_multi_exec("INSERT INTO modreq(objid) VALUES(%d)", nrid);
296296
 }
297297
 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid);
298298
 db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", nrid);
299
- run_common_script();
300299
 manifest_crosslink(nrid, pWiki);
301300
 }
302301
303302
 /*
304303
 ** Formal names and common names for the various wiki styles.
305304
--- src/wiki.c
+++ src/wiki.c
@@ -294,11 +294,10 @@
294 moderation_table_create();
295 db_multi_exec("INSERT INTO modreq(objid) VALUES(%d)", nrid);
296 }
297 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid);
298 db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", nrid);
299 run_common_script();
300 manifest_crosslink(nrid, pWiki);
301 }
302
303 /*
304 ** Formal names and common names for the various wiki styles.
305
--- src/wiki.c
+++ src/wiki.c
@@ -294,11 +294,10 @@
294 moderation_table_create();
295 db_multi_exec("INSERT INTO modreq(objid) VALUES(%d)", nrid);
296 }
297 db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid);
298 db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", nrid);
 
299 manifest_crosslink(nrid, pWiki);
300 }
301
302 /*
303 ** Formal names and common names for the various wiki styles.
304

Keyboard Shortcuts

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