Fossil SCM
On the taglist and tagtimeline pages, only show non-propagating tags. Omit the branch tags.
Commit
8636eef6e28f8e45217c32e399efe19151f75080
Parent
c7fe01fe8ee4e23…
1 file changed
+4
-4
+4
-4
| --- src/tag.c | ||
| +++ src/tag.c | ||
| @@ -493,17 +493,17 @@ | ||
| 493 | 493 | if( !g.okRead ){ |
| 494 | 494 | login_needed(); |
| 495 | 495 | } |
| 496 | 496 | style_header("Tags"); |
| 497 | 497 | style_submenu_element("Timeline", "Timeline", "tagtimeline"); |
| 498 | - @ <h2>Tags used by one or more check-ins:</h2> | |
| 498 | + @ <h2>Non-propagating tags:</h2> | |
| 499 | 499 | db_prepare(&q, |
| 500 | 500 | "SELECT substr(tagname,5)" |
| 501 | 501 | " FROM tag" |
| 502 | 502 | " WHERE EXISTS(SELECT 1 FROM tagxref" |
| 503 | 503 | " WHERE tagid=tag.tagid" |
| 504 | - " AND tagtype>0)" | |
| 504 | + " AND tagtype=1)" | |
| 505 | 505 | " AND tagname GLOB 'sym-*'" |
| 506 | 506 | " ORDER BY tagname" |
| 507 | 507 | ); |
| 508 | 508 | @ <ul> |
| 509 | 509 | while( db_step(&q)==SQLITE_ROW ){ |
| @@ -555,14 +555,14 @@ | ||
| 555 | 555 | if( !g.okRead ){ login_needed(); return; } |
| 556 | 556 | |
| 557 | 557 | style_header("Tagged Check-ins"); |
| 558 | 558 | style_submenu_element("List", "List", "taglist"); |
| 559 | 559 | login_anonymous_available(); |
| 560 | - @ <h2>Initial check-ins for each tag:</t2> | |
| 560 | + @ <h2>Check-ins with non-propagating tags:</t2> | |
| 561 | 561 | db_prepare(&q, |
| 562 | 562 | "%s AND blob.rid IN (SELECT rid FROM tagxref" |
| 563 | - " WHERE tagtype>0 AND srcid>0" | |
| 563 | + " WHERE tagtype=1 AND srcid>0" | |
| 564 | 564 | " AND tagid IN (SELECT tagid FROM tag " |
| 565 | 565 | " WHERE tagname GLOB 'sym-*'))" |
| 566 | 566 | " ORDER BY event.mtime DESC", |
| 567 | 567 | timeline_query_for_www() |
| 568 | 568 | ); |
| 569 | 569 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -493,17 +493,17 @@ | |
| 493 | if( !g.okRead ){ |
| 494 | login_needed(); |
| 495 | } |
| 496 | style_header("Tags"); |
| 497 | style_submenu_element("Timeline", "Timeline", "tagtimeline"); |
| 498 | @ <h2>Tags used by one or more check-ins:</h2> |
| 499 | db_prepare(&q, |
| 500 | "SELECT substr(tagname,5)" |
| 501 | " FROM tag" |
| 502 | " WHERE EXISTS(SELECT 1 FROM tagxref" |
| 503 | " WHERE tagid=tag.tagid" |
| 504 | " AND tagtype>0)" |
| 505 | " AND tagname GLOB 'sym-*'" |
| 506 | " ORDER BY tagname" |
| 507 | ); |
| 508 | @ <ul> |
| 509 | while( db_step(&q)==SQLITE_ROW ){ |
| @@ -555,14 +555,14 @@ | |
| 555 | if( !g.okRead ){ login_needed(); return; } |
| 556 | |
| 557 | style_header("Tagged Check-ins"); |
| 558 | style_submenu_element("List", "List", "taglist"); |
| 559 | login_anonymous_available(); |
| 560 | @ <h2>Initial check-ins for each tag:</t2> |
| 561 | db_prepare(&q, |
| 562 | "%s AND blob.rid IN (SELECT rid FROM tagxref" |
| 563 | " WHERE tagtype>0 AND srcid>0" |
| 564 | " AND tagid IN (SELECT tagid FROM tag " |
| 565 | " WHERE tagname GLOB 'sym-*'))" |
| 566 | " ORDER BY event.mtime DESC", |
| 567 | timeline_query_for_www() |
| 568 | ); |
| 569 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -493,17 +493,17 @@ | |
| 493 | if( !g.okRead ){ |
| 494 | login_needed(); |
| 495 | } |
| 496 | style_header("Tags"); |
| 497 | style_submenu_element("Timeline", "Timeline", "tagtimeline"); |
| 498 | @ <h2>Non-propagating tags:</h2> |
| 499 | db_prepare(&q, |
| 500 | "SELECT substr(tagname,5)" |
| 501 | " FROM tag" |
| 502 | " WHERE EXISTS(SELECT 1 FROM tagxref" |
| 503 | " WHERE tagid=tag.tagid" |
| 504 | " AND tagtype=1)" |
| 505 | " AND tagname GLOB 'sym-*'" |
| 506 | " ORDER BY tagname" |
| 507 | ); |
| 508 | @ <ul> |
| 509 | while( db_step(&q)==SQLITE_ROW ){ |
| @@ -555,14 +555,14 @@ | |
| 555 | if( !g.okRead ){ login_needed(); return; } |
| 556 | |
| 557 | style_header("Tagged Check-ins"); |
| 558 | style_submenu_element("List", "List", "taglist"); |
| 559 | login_anonymous_available(); |
| 560 | @ <h2>Check-ins with non-propagating tags:</t2> |
| 561 | db_prepare(&q, |
| 562 | "%s AND blob.rid IN (SELECT rid FROM tagxref" |
| 563 | " WHERE tagtype=1 AND srcid>0" |
| 564 | " AND tagid IN (SELECT tagid FROM tag " |
| 565 | " WHERE tagname GLOB 'sym-*'))" |
| 566 | " ORDER BY event.mtime DESC", |
| 567 | timeline_query_for_www() |
| 568 | ); |
| 569 |