Fossil SCM
Fix technote linkage on the timeline.
Commit
f181c88a71b1200feee95893f3f462150ea6181fdc113bf4b36210b52dda6732
Parent
d5cff12464bde6d…
1 file changed
+9
-2
+9
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -191,11 +191,11 @@ | ||
| 191 | 191 | /* int isLeaf = db_column_int(pQuery, 5); // not used */ |
| 192 | 192 | const char *zDate = db_column_text(pQuery, 2); |
| 193 | 193 | const char *zType = db_column_text(pQuery, 7); |
| 194 | 194 | const char *zUser = db_column_text(pQuery, 4); |
| 195 | 195 | const char *zTagList = db_column_text(pQuery, 8); |
| 196 | - /* int tagid = db_column_int(pQuery, 9); // not used */ | |
| 196 | + int tagid = db_column_int(pQuery, 9); | |
| 197 | 197 | const char *zDispUser = zUser && zUser[0] ? zUser : "anonymous"; |
| 198 | 198 | |
| 199 | 199 | if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){ |
| 200 | 200 | cgi_printf("("); |
| 201 | 201 | } |
| @@ -278,11 +278,18 @@ | ||
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | tag_private_status(rid); |
| 281 | 281 | |
| 282 | 282 | if( (tmFlags & TIMELINE_CLASSIC)==0 ){ |
| 283 | - cgi_printf(" hash: %z%S</a>", href("%R/info/%!S", zUuid), zUuid); | |
| 283 | + if( zType[0]=='e' && tagid ){ | |
| 284 | + char *zId = db_text(0, | |
| 285 | + "SELECT substr(tagname,7) FROM tag WHERE tagid=abs(%d)", tagid); | |
| 286 | + cgi_printf(" technote: %z%S</a>", | |
| 287 | + href("%R/technote/%t",zId), zId); | |
| 288 | + }else{ | |
| 289 | + cgi_printf(" hash: %z%S</a>", href("%R/info/%!S", zUuid), zUuid); | |
| 290 | + } | |
| 284 | 291 | } |
| 285 | 292 | |
| 286 | 293 | /* End timelineDetail */ |
| 287 | 294 | if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){ |
| 288 | 295 | cgi_printf(")"); |
| 289 | 296 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -191,11 +191,11 @@ | |
| 191 | /* int isLeaf = db_column_int(pQuery, 5); // not used */ |
| 192 | const char *zDate = db_column_text(pQuery, 2); |
| 193 | const char *zType = db_column_text(pQuery, 7); |
| 194 | const char *zUser = db_column_text(pQuery, 4); |
| 195 | const char *zTagList = db_column_text(pQuery, 8); |
| 196 | /* int tagid = db_column_int(pQuery, 9); // not used */ |
| 197 | const char *zDispUser = zUser && zUser[0] ? zUser : "anonymous"; |
| 198 | |
| 199 | if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){ |
| 200 | cgi_printf("("); |
| 201 | } |
| @@ -278,11 +278,18 @@ | |
| 278 | } |
| 279 | } |
| 280 | tag_private_status(rid); |
| 281 | |
| 282 | if( (tmFlags & TIMELINE_CLASSIC)==0 ){ |
| 283 | cgi_printf(" hash: %z%S</a>", href("%R/info/%!S", zUuid), zUuid); |
| 284 | } |
| 285 | |
| 286 | /* End timelineDetail */ |
| 287 | if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){ |
| 288 | cgi_printf(")"); |
| 289 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -191,11 +191,11 @@ | |
| 191 | /* int isLeaf = db_column_int(pQuery, 5); // not used */ |
| 192 | const char *zDate = db_column_text(pQuery, 2); |
| 193 | const char *zType = db_column_text(pQuery, 7); |
| 194 | const char *zUser = db_column_text(pQuery, 4); |
| 195 | const char *zTagList = db_column_text(pQuery, 8); |
| 196 | int tagid = db_column_int(pQuery, 9); |
| 197 | const char *zDispUser = zUser && zUser[0] ? zUser : "anonymous"; |
| 198 | |
| 199 | if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){ |
| 200 | cgi_printf("("); |
| 201 | } |
| @@ -278,11 +278,18 @@ | |
| 278 | } |
| 279 | } |
| 280 | tag_private_status(rid); |
| 281 | |
| 282 | if( (tmFlags & TIMELINE_CLASSIC)==0 ){ |
| 283 | if( zType[0]=='e' && tagid ){ |
| 284 | char *zId = db_text(0, |
| 285 | "SELECT substr(tagname,7) FROM tag WHERE tagid=abs(%d)", tagid); |
| 286 | cgi_printf(" technote: %z%S</a>", |
| 287 | href("%R/technote/%t",zId), zId); |
| 288 | }else{ |
| 289 | cgi_printf(" hash: %z%S</a>", href("%R/info/%!S", zUuid), zUuid); |
| 290 | } |
| 291 | } |
| 292 | |
| 293 | /* End timelineDetail */ |
| 294 | if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){ |
| 295 | cgi_printf(")"); |
| 296 |