Fossil SCM
Show tags associated with the download check-in on the /rchvdwnld page.
Commit
bee49c13f82e7f1fdb448f60bbbb6b82da1dfdd4476526388a14741bd3342025
Parent
f07aa6260103851…
1 file changed
+12
-1
+12
-1
| --- src/tar.c | ||
| +++ src/tar.c | ||
| @@ -1311,10 +1311,11 @@ | ||
| 1311 | 1311 | void rchvdwnld_page(void){ |
| 1312 | 1312 | const char *zUuid; |
| 1313 | 1313 | char *zBase; |
| 1314 | 1314 | int nUuid; |
| 1315 | 1315 | int rid; |
| 1316 | + char *zTags; | |
| 1316 | 1317 | login_check_credentials(); |
| 1317 | 1318 | if( !g.perm.Zip ){ login_needed(g.anon.Zip); return; } |
| 1318 | 1319 | if( robot_restrict("zip") || robot_restrict("download") ) return; |
| 1319 | 1320 | |
| 1320 | 1321 | zUuid = P("name"); |
| @@ -1328,14 +1329,24 @@ | ||
| 1328 | 1329 | if( rid<=0 ){ |
| 1329 | 1330 | fossil_redirect_home(); |
| 1330 | 1331 | } |
| 1331 | 1332 | } |
| 1332 | 1333 | zUuid = db_text(zUuid, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1334 | + zTags = db_text(0, | |
| 1335 | + "SELECT if(cnt,' ('||tags||')','') FROM (" | |
| 1336 | + "SELECT group_concat(substr(tagname,5),', ') AS tags, count(*) AS cnt" | |
| 1337 | + " FROM tag JOIN tagxref USING(tagid)" | |
| 1338 | + " WHERE rid=%d" | |
| 1339 | + " AND tagtype=1" | |
| 1340 | + " AND tagname GLOB 'sym-*'" | |
| 1341 | + ")", | |
| 1342 | + rid | |
| 1343 | + ); | |
| 1333 | 1344 | style_header("Downloads For Check-in %!S", zUuid); |
| 1334 | 1345 | zBase = archive_base_name(rid); |
| 1335 | 1346 | @ <div class="section accordion">Downloads for check-in \ |
| 1336 | - @ %z(href("%R/info/%!S",zUuid))%S(zUuid)</a></div> | |
| 1347 | + @ %z(href("%R/info/%!S",zUuid))%S(zUuid)</a>%h(zTags)</div> | |
| 1337 | 1348 | @ <div class="accordion_panel"> |
| 1338 | 1349 | @ <table class="label-value"> |
| 1339 | 1350 | @ <tr> |
| 1340 | 1351 | @ <th>Tarball:</th> |
| 1341 | 1352 | @ <td>%z(href("%R/tarball/%s.tar.gz",zBase))\ |
| 1342 | 1353 |
| --- src/tar.c | |
| +++ src/tar.c | |
| @@ -1311,10 +1311,11 @@ | |
| 1311 | void rchvdwnld_page(void){ |
| 1312 | const char *zUuid; |
| 1313 | char *zBase; |
| 1314 | int nUuid; |
| 1315 | int rid; |
| 1316 | login_check_credentials(); |
| 1317 | if( !g.perm.Zip ){ login_needed(g.anon.Zip); return; } |
| 1318 | if( robot_restrict("zip") || robot_restrict("download") ) return; |
| 1319 | |
| 1320 | zUuid = P("name"); |
| @@ -1328,14 +1329,24 @@ | |
| 1328 | if( rid<=0 ){ |
| 1329 | fossil_redirect_home(); |
| 1330 | } |
| 1331 | } |
| 1332 | zUuid = db_text(zUuid, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1333 | style_header("Downloads For Check-in %!S", zUuid); |
| 1334 | zBase = archive_base_name(rid); |
| 1335 | @ <div class="section accordion">Downloads for check-in \ |
| 1336 | @ %z(href("%R/info/%!S",zUuid))%S(zUuid)</a></div> |
| 1337 | @ <div class="accordion_panel"> |
| 1338 | @ <table class="label-value"> |
| 1339 | @ <tr> |
| 1340 | @ <th>Tarball:</th> |
| 1341 | @ <td>%z(href("%R/tarball/%s.tar.gz",zBase))\ |
| 1342 |
| --- src/tar.c | |
| +++ src/tar.c | |
| @@ -1311,10 +1311,11 @@ | |
| 1311 | void rchvdwnld_page(void){ |
| 1312 | const char *zUuid; |
| 1313 | char *zBase; |
| 1314 | int nUuid; |
| 1315 | int rid; |
| 1316 | char *zTags; |
| 1317 | login_check_credentials(); |
| 1318 | if( !g.perm.Zip ){ login_needed(g.anon.Zip); return; } |
| 1319 | if( robot_restrict("zip") || robot_restrict("download") ) return; |
| 1320 | |
| 1321 | zUuid = P("name"); |
| @@ -1328,14 +1329,24 @@ | |
| 1329 | if( rid<=0 ){ |
| 1330 | fossil_redirect_home(); |
| 1331 | } |
| 1332 | } |
| 1333 | zUuid = db_text(zUuid, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1334 | zTags = db_text(0, |
| 1335 | "SELECT if(cnt,' ('||tags||')','') FROM (" |
| 1336 | "SELECT group_concat(substr(tagname,5),', ') AS tags, count(*) AS cnt" |
| 1337 | " FROM tag JOIN tagxref USING(tagid)" |
| 1338 | " WHERE rid=%d" |
| 1339 | " AND tagtype=1" |
| 1340 | " AND tagname GLOB 'sym-*'" |
| 1341 | ")", |
| 1342 | rid |
| 1343 | ); |
| 1344 | style_header("Downloads For Check-in %!S", zUuid); |
| 1345 | zBase = archive_base_name(rid); |
| 1346 | @ <div class="section accordion">Downloads for check-in \ |
| 1347 | @ %z(href("%R/info/%!S",zUuid))%S(zUuid)</a>%h(zTags)</div> |
| 1348 | @ <div class="accordion_panel"> |
| 1349 | @ <table class="label-value"> |
| 1350 | @ <tr> |
| 1351 | @ <th>Tarball:</th> |
| 1352 | @ <td>%z(href("%R/tarball/%s.tar.gz",zBase))\ |
| 1353 |