Fossil SCM
Make the (Remove User Flag) link work even if the "u" query parameter was used instead of "user".
Commit
a4655a1dab36ec7cc6bd9710166f4e8d3d7a1a8a
Parent
cbbee1731207089…
1 file changed
+8
-3
+8
-3
| --- src/statrep.c | ||
| +++ src/statrep.c | ||
| @@ -756,21 +756,26 @@ | ||
| 756 | 756 | */ |
| 757 | 757 | void stats_report_page(){ |
| 758 | 758 | HQuery url; /* URL for various branch links */ |
| 759 | 759 | const char *zView = P("view"); /* Which view/report to show. */ |
| 760 | 760 | const char *zUserName = P("user"); |
| 761 | + int haveU = !zUserName; | |
| 761 | 762 | |
| 762 | 763 | login_check_credentials(); |
| 763 | 764 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 764 | - if(!zUserName) zUserName = P("u"); | |
| 765 | + if(!zUserName){ | |
| 766 | + zUserName = P("u"); | |
| 767 | + haveU = !!zUserName; | |
| 768 | + } | |
| 765 | 769 | if(zUserName && !*zUserName){ |
| 766 | 770 | zUserName = NULL; |
| 767 | 771 | } |
| 768 | 772 | url_initialize(&url, "reports"); |
| 769 | 773 | if(zUserName){ |
| 770 | - url_add_parameter(&url,"user", zUserName); | |
| 771 | - statrep_submenu(&url, "(Remove User Flag)", "view", zView, "user"); | |
| 774 | + url_add_parameter(&url, haveU ? "u" : "user", zUserName); | |
| 775 | + statrep_submenu(&url, "(Remove User Flag)", "view", zView, | |
| 776 | + haveU ? "u" : "user"); | |
| 772 | 777 | } |
| 773 | 778 | statrep_submenu(&url, "By Year", "view", "byyear", 0); |
| 774 | 779 | statrep_submenu(&url, "By Month", "view", "bymonth", 0); |
| 775 | 780 | statrep_submenu(&url, "By Week", "view", "byweek", 0); |
| 776 | 781 | statrep_submenu(&url, "By Weekday", "view", "byweekday", 0); |
| 777 | 782 |
| --- src/statrep.c | |
| +++ src/statrep.c | |
| @@ -756,21 +756,26 @@ | |
| 756 | */ |
| 757 | void stats_report_page(){ |
| 758 | HQuery url; /* URL for various branch links */ |
| 759 | const char *zView = P("view"); /* Which view/report to show. */ |
| 760 | const char *zUserName = P("user"); |
| 761 | |
| 762 | login_check_credentials(); |
| 763 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 764 | if(!zUserName) zUserName = P("u"); |
| 765 | if(zUserName && !*zUserName){ |
| 766 | zUserName = NULL; |
| 767 | } |
| 768 | url_initialize(&url, "reports"); |
| 769 | if(zUserName){ |
| 770 | url_add_parameter(&url,"user", zUserName); |
| 771 | statrep_submenu(&url, "(Remove User Flag)", "view", zView, "user"); |
| 772 | } |
| 773 | statrep_submenu(&url, "By Year", "view", "byyear", 0); |
| 774 | statrep_submenu(&url, "By Month", "view", "bymonth", 0); |
| 775 | statrep_submenu(&url, "By Week", "view", "byweek", 0); |
| 776 | statrep_submenu(&url, "By Weekday", "view", "byweekday", 0); |
| 777 |
| --- src/statrep.c | |
| +++ src/statrep.c | |
| @@ -756,21 +756,26 @@ | |
| 756 | */ |
| 757 | void stats_report_page(){ |
| 758 | HQuery url; /* URL for various branch links */ |
| 759 | const char *zView = P("view"); /* Which view/report to show. */ |
| 760 | const char *zUserName = P("user"); |
| 761 | int haveU = !zUserName; |
| 762 | |
| 763 | login_check_credentials(); |
| 764 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 765 | if(!zUserName){ |
| 766 | zUserName = P("u"); |
| 767 | haveU = !!zUserName; |
| 768 | } |
| 769 | if(zUserName && !*zUserName){ |
| 770 | zUserName = NULL; |
| 771 | } |
| 772 | url_initialize(&url, "reports"); |
| 773 | if(zUserName){ |
| 774 | url_add_parameter(&url, haveU ? "u" : "user", zUserName); |
| 775 | statrep_submenu(&url, "(Remove User Flag)", "view", zView, |
| 776 | haveU ? "u" : "user"); |
| 777 | } |
| 778 | statrep_submenu(&url, "By Year", "view", "byyear", 0); |
| 779 | statrep_submenu(&url, "By Month", "view", "bymonth", 0); |
| 780 | statrep_submenu(&url, "By Week", "view", "byweek", 0); |
| 781 | statrep_submenu(&url, "By Weekday", "view", "byweekday", 0); |
| 782 |