Fossil SCM
Web-based annotation shows lines numbers and the log by default.
Commit
434be79b43e2b2a765be7e6fae316cbc3542ca16
Parent
d3fd72f442c4d91…
1 file changed
+6
-6
+6
-6
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2423,12 +2423,12 @@ | ||
| 2423 | 2423 | char zLn[10]; /* Line number buffer */ |
| 2424 | 2424 | char zFormat[10]; /* Format string for line numbers */ |
| 2425 | 2425 | Annotator ann; |
| 2426 | 2426 | HQuery url; |
| 2427 | 2427 | |
| 2428 | - showLn = P("ln")!=0; | |
| 2429 | - showLog = P("log")!=0; | |
| 2428 | + showLn = atoi(PD("ln","1")); | |
| 2429 | + showLog = atoi(PD("log","1")); | |
| 2430 | 2430 | login_check_credentials(); |
| 2431 | 2431 | if( !g.perm.Read ){ login_needed(); return; } |
| 2432 | 2432 | mid = name_to_typed_rid(PD("checkin","0"),"ci"); |
| 2433 | 2433 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", P("filename")); |
| 2434 | 2434 | if( mid==0 || fnid==0 ){ fossil_redirect_home(); } |
| @@ -2443,22 +2443,22 @@ | ||
| 2443 | 2443 | url_add_parameter(&url, "checkin", P("checkin")); |
| 2444 | 2444 | url_add_parameter(&url, "filename", P("filename")); |
| 2445 | 2445 | if( iLimit!=20 ){ |
| 2446 | 2446 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2447 | 2447 | } |
| 2448 | - if( showLog ) url_add_parameter(&url, "log", "1"); | |
| 2449 | - if( showLn ) url_add_parameter(&url, "ln", "1"); | |
| 2448 | + url_add_parameter(&url, "log", showLog ? "1" : "0"); | |
| 2449 | + url_add_parameter(&url, "ln", showLn ? "1" : "0"); | |
| 2450 | 2450 | if( showLog ){ |
| 2451 | 2451 | style_submenu_element("Hide Log", "Hide Log", |
| 2452 | - url_render(&url, "log", 0, 0, 0)); | |
| 2452 | + url_render(&url, "log", "0", 0, 0)); | |
| 2453 | 2453 | }else{ |
| 2454 | 2454 | style_submenu_element("Show Log", "Show Log", |
| 2455 | 2455 | url_render(&url, "log", "1", 0, 0)); |
| 2456 | 2456 | } |
| 2457 | 2457 | if( showLn ){ |
| 2458 | 2458 | style_submenu_element("Hide Line Numbers", "Hide Line Numbers", |
| 2459 | - url_render(&url, "ln", 0, 0, 0)); | |
| 2459 | + url_render(&url, "ln", "0", 0, 0)); | |
| 2460 | 2460 | }else{ |
| 2461 | 2461 | style_submenu_element("Show Line Numbers", "Show Line Numbers", |
| 2462 | 2462 | url_render(&url, "ln", "1", 0, 0)); |
| 2463 | 2463 | } |
| 2464 | 2464 | if( iLimit>0 ){ |
| 2465 | 2465 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2423,12 +2423,12 @@ | |
| 2423 | char zLn[10]; /* Line number buffer */ |
| 2424 | char zFormat[10]; /* Format string for line numbers */ |
| 2425 | Annotator ann; |
| 2426 | HQuery url; |
| 2427 | |
| 2428 | showLn = P("ln")!=0; |
| 2429 | showLog = P("log")!=0; |
| 2430 | login_check_credentials(); |
| 2431 | if( !g.perm.Read ){ login_needed(); return; } |
| 2432 | mid = name_to_typed_rid(PD("checkin","0"),"ci"); |
| 2433 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", P("filename")); |
| 2434 | if( mid==0 || fnid==0 ){ fossil_redirect_home(); } |
| @@ -2443,22 +2443,22 @@ | |
| 2443 | url_add_parameter(&url, "checkin", P("checkin")); |
| 2444 | url_add_parameter(&url, "filename", P("filename")); |
| 2445 | if( iLimit!=20 ){ |
| 2446 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2447 | } |
| 2448 | if( showLog ) url_add_parameter(&url, "log", "1"); |
| 2449 | if( showLn ) url_add_parameter(&url, "ln", "1"); |
| 2450 | if( showLog ){ |
| 2451 | style_submenu_element("Hide Log", "Hide Log", |
| 2452 | url_render(&url, "log", 0, 0, 0)); |
| 2453 | }else{ |
| 2454 | style_submenu_element("Show Log", "Show Log", |
| 2455 | url_render(&url, "log", "1", 0, 0)); |
| 2456 | } |
| 2457 | if( showLn ){ |
| 2458 | style_submenu_element("Hide Line Numbers", "Hide Line Numbers", |
| 2459 | url_render(&url, "ln", 0, 0, 0)); |
| 2460 | }else{ |
| 2461 | style_submenu_element("Show Line Numbers", "Show Line Numbers", |
| 2462 | url_render(&url, "ln", "1", 0, 0)); |
| 2463 | } |
| 2464 | if( iLimit>0 ){ |
| 2465 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2423,12 +2423,12 @@ | |
| 2423 | char zLn[10]; /* Line number buffer */ |
| 2424 | char zFormat[10]; /* Format string for line numbers */ |
| 2425 | Annotator ann; |
| 2426 | HQuery url; |
| 2427 | |
| 2428 | showLn = atoi(PD("ln","1")); |
| 2429 | showLog = atoi(PD("log","1")); |
| 2430 | login_check_credentials(); |
| 2431 | if( !g.perm.Read ){ login_needed(); return; } |
| 2432 | mid = name_to_typed_rid(PD("checkin","0"),"ci"); |
| 2433 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", P("filename")); |
| 2434 | if( mid==0 || fnid==0 ){ fossil_redirect_home(); } |
| @@ -2443,22 +2443,22 @@ | |
| 2443 | url_add_parameter(&url, "checkin", P("checkin")); |
| 2444 | url_add_parameter(&url, "filename", P("filename")); |
| 2445 | if( iLimit!=20 ){ |
| 2446 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2447 | } |
| 2448 | url_add_parameter(&url, "log", showLog ? "1" : "0"); |
| 2449 | url_add_parameter(&url, "ln", showLn ? "1" : "0"); |
| 2450 | if( showLog ){ |
| 2451 | style_submenu_element("Hide Log", "Hide Log", |
| 2452 | url_render(&url, "log", "0", 0, 0)); |
| 2453 | }else{ |
| 2454 | style_submenu_element("Show Log", "Show Log", |
| 2455 | url_render(&url, "log", "1", 0, 0)); |
| 2456 | } |
| 2457 | if( showLn ){ |
| 2458 | style_submenu_element("Hide Line Numbers", "Hide Line Numbers", |
| 2459 | url_render(&url, "ln", "0", 0, 0)); |
| 2460 | }else{ |
| 2461 | style_submenu_element("Show Line Numbers", "Show Line Numbers", |
| 2462 | url_render(&url, "ln", "1", 0, 0)); |
| 2463 | } |
| 2464 | if( iLimit>0 ){ |
| 2465 |