Fossil SCM
Change the page header from Baseline to Check-in on the "vinfo" page. Fix a bug introduced into tagview (ticket [309c57b3d27219fa6ad601c0021dc067a7cb992d]).
Commit
bf7ca1a4d8ce33c852164c9105fa35c3e8c81339
Parent
fecb3e5cc90bf75…
2 files changed
+2
-2
+1
-1
+2
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -316,11 +316,11 @@ | ||
| 316 | 316 | |
| 317 | 317 | login_check_credentials(); |
| 318 | 318 | if( !g.okRead ){ login_needed(); return; } |
| 319 | 319 | rid = name_to_rid(PD("name","0")); |
| 320 | 320 | if( rid==0 ){ |
| 321 | - style_header("Baseline Information Error"); | |
| 321 | + style_header("Check-in Information Error"); | |
| 322 | 322 | @ No such object: %h(g.argv[2]) |
| 323 | 323 | style_footer(); |
| 324 | 324 | return; |
| 325 | 325 | } |
| 326 | 326 | isLeaf = !db_exists("SELECT 1 FROM plink WHERE pid=%d", rid); |
| @@ -331,11 +331,11 @@ | ||
| 331 | 331 | " AND event.objid=%d", |
| 332 | 332 | rid, rid |
| 333 | 333 | ); |
| 334 | 334 | if( db_step(&q)==SQLITE_ROW ){ |
| 335 | 335 | const char *zUuid = db_column_text(&q, 0); |
| 336 | - char *zTitle = mprintf("Baseline [%.10s]", zUuid); | |
| 336 | + char *zTitle = mprintf("Check-in [%.10s]", zUuid); | |
| 337 | 337 | char *zEUser, *zEComment; |
| 338 | 338 | const char *zUser; |
| 339 | 339 | const char *zComment; |
| 340 | 340 | style_header(zTitle); |
| 341 | 341 | login_anonymous_available(); |
| 342 | 342 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -316,11 +316,11 @@ | |
| 316 | |
| 317 | login_check_credentials(); |
| 318 | if( !g.okRead ){ login_needed(); return; } |
| 319 | rid = name_to_rid(PD("name","0")); |
| 320 | if( rid==0 ){ |
| 321 | style_header("Baseline Information Error"); |
| 322 | @ No such object: %h(g.argv[2]) |
| 323 | style_footer(); |
| 324 | return; |
| 325 | } |
| 326 | isLeaf = !db_exists("SELECT 1 FROM plink WHERE pid=%d", rid); |
| @@ -331,11 +331,11 @@ | |
| 331 | " AND event.objid=%d", |
| 332 | rid, rid |
| 333 | ); |
| 334 | if( db_step(&q)==SQLITE_ROW ){ |
| 335 | const char *zUuid = db_column_text(&q, 0); |
| 336 | char *zTitle = mprintf("Baseline [%.10s]", zUuid); |
| 337 | char *zEUser, *zEComment; |
| 338 | const char *zUser; |
| 339 | const char *zComment; |
| 340 | style_header(zTitle); |
| 341 | login_anonymous_available(); |
| 342 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -316,11 +316,11 @@ | |
| 316 | |
| 317 | login_check_credentials(); |
| 318 | if( !g.okRead ){ login_needed(); return; } |
| 319 | rid = name_to_rid(PD("name","0")); |
| 320 | if( rid==0 ){ |
| 321 | style_header("Check-in Information Error"); |
| 322 | @ No such object: %h(g.argv[2]) |
| 323 | style_footer(); |
| 324 | return; |
| 325 | } |
| 326 | isLeaf = !db_exists("SELECT 1 FROM plink WHERE pid=%d", rid); |
| @@ -331,11 +331,11 @@ | |
| 331 | " AND event.objid=%d", |
| 332 | rid, rid |
| 333 | ); |
| 334 | if( db_step(&q)==SQLITE_ROW ){ |
| 335 | const char *zUuid = db_column_text(&q, 0); |
| 336 | char *zTitle = mprintf("Check-in [%.10s]", zUuid); |
| 337 | char *zEUser, *zEComment; |
| 338 | const char *zUser; |
| 339 | const char *zComment; |
| 340 | style_header(zTitle); |
| 341 | login_anonymous_available(); |
| 342 |
+1
-1
| --- src/tagview.c | ||
| +++ src/tagview.c | ||
| @@ -177,11 +177,11 @@ | ||
| 177 | 177 | zPrefix, zName); |
| 178 | 178 | zSql = mprintf("%s AND EXISTS (SELECT 1" |
| 179 | 179 | " FROM tagxref" |
| 180 | 180 | " WHERE tagxref.rid = event.objid" |
| 181 | 181 | " AND tagxref.tagtype > 0" |
| 182 | - " AND tagxref.tagid = %d" | |
| 182 | + " AND tagxref.tagid = %d)" | |
| 183 | 183 | " ORDER BY 3 desc", |
| 184 | 184 | timeline_query_for_www(), tagid |
| 185 | 185 | ); |
| 186 | 186 | db_prepare(&q, zSql); |
| 187 | 187 | free(zSql); |
| 188 | 188 |
| --- src/tagview.c | |
| +++ src/tagview.c | |
| @@ -177,11 +177,11 @@ | |
| 177 | zPrefix, zName); |
| 178 | zSql = mprintf("%s AND EXISTS (SELECT 1" |
| 179 | " FROM tagxref" |
| 180 | " WHERE tagxref.rid = event.objid" |
| 181 | " AND tagxref.tagtype > 0" |
| 182 | " AND tagxref.tagid = %d" |
| 183 | " ORDER BY 3 desc", |
| 184 | timeline_query_for_www(), tagid |
| 185 | ); |
| 186 | db_prepare(&q, zSql); |
| 187 | free(zSql); |
| 188 |
| --- src/tagview.c | |
| +++ src/tagview.c | |
| @@ -177,11 +177,11 @@ | |
| 177 | zPrefix, zName); |
| 178 | zSql = mprintf("%s AND EXISTS (SELECT 1" |
| 179 | " FROM tagxref" |
| 180 | " WHERE tagxref.rid = event.objid" |
| 181 | " AND tagxref.tagtype > 0" |
| 182 | " AND tagxref.tagid = %d)" |
| 183 | " ORDER BY 3 desc", |
| 184 | timeline_query_for_www(), tagid |
| 185 | ); |
| 186 | db_prepare(&q, zSql); |
| 187 | free(zSql); |
| 188 |