Fossil SCM
Change the "Timeline" submenu item on the /forum page so that it carries the status= query parameter through to the timeline. Also omit the vfx query parameter since we now have the "Content" toggle on the timeline.
Commit
d6dcee660e8e12f007fcf7555b9e159c58ac52aac21604a5522985e78fce181a
Parent
9ba7a0d8f8b494f…
1 file changed
+6
-1
+6
-1
| --- src/forum.c | ||
| +++ src/forum.c | ||
| @@ -2637,11 +2637,10 @@ | ||
| 2637 | 2637 | bHasStatus = pFstat->n>1; |
| 2638 | 2638 | } |
| 2639 | 2639 | style_set_current_feature("forum"); |
| 2640 | 2640 | style_header("%s%s", db_get("forum-title","Forum"), |
| 2641 | 2641 | isSearch ? " Search Results" : ""); |
| 2642 | - style_submenu_element("Timeline", "%R/timeline?ss=v&y=f&vfx"); | |
| 2643 | 2642 | if( g.perm.WrForum ){ |
| 2644 | 2643 | style_submenu_element("New Thread","%R/forumnew"); |
| 2645 | 2644 | }else{ |
| 2646 | 2645 | style_submenu_element("New Thread","%R/login"); |
| 2647 | 2646 | } |
| @@ -2678,10 +2677,16 @@ | ||
| 2678 | 2677 | zStatusFilter = 0; |
| 2679 | 2678 | }else{ |
| 2680 | 2679 | bFilter = bHasStatus; |
| 2681 | 2680 | } |
| 2682 | 2681 | } |
| 2682 | + if( bFilter ){ | |
| 2683 | + style_submenu_element("Timeline", | |
| 2684 | + "%R/timeline?ss=v&y=f&status=%t", zStatusFilter); | |
| 2685 | + }else{ | |
| 2686 | + style_submenu_element("Timeline", "%R/timeline?ss=v&y=f"); | |
| 2687 | + } | |
| 2683 | 2688 | if( bHasForum ){ |
| 2684 | 2689 | Stmt qStat = empty_Stmt; /* Query to get status information */ |
| 2685 | 2690 | if( bHasStatus ){ |
| 2686 | 2691 | /* The qStat query runs once for each output row generate by the |
| 2687 | 2692 | ** q query. It determines the value and label of the status for |
| 2688 | 2693 |
| --- src/forum.c | |
| +++ src/forum.c | |
| @@ -2637,11 +2637,10 @@ | |
| 2637 | bHasStatus = pFstat->n>1; |
| 2638 | } |
| 2639 | style_set_current_feature("forum"); |
| 2640 | style_header("%s%s", db_get("forum-title","Forum"), |
| 2641 | isSearch ? " Search Results" : ""); |
| 2642 | style_submenu_element("Timeline", "%R/timeline?ss=v&y=f&vfx"); |
| 2643 | if( g.perm.WrForum ){ |
| 2644 | style_submenu_element("New Thread","%R/forumnew"); |
| 2645 | }else{ |
| 2646 | style_submenu_element("New Thread","%R/login"); |
| 2647 | } |
| @@ -2678,10 +2677,16 @@ | |
| 2678 | zStatusFilter = 0; |
| 2679 | }else{ |
| 2680 | bFilter = bHasStatus; |
| 2681 | } |
| 2682 | } |
| 2683 | if( bHasForum ){ |
| 2684 | Stmt qStat = empty_Stmt; /* Query to get status information */ |
| 2685 | if( bHasStatus ){ |
| 2686 | /* The qStat query runs once for each output row generate by the |
| 2687 | ** q query. It determines the value and label of the status for |
| 2688 |
| --- src/forum.c | |
| +++ src/forum.c | |
| @@ -2637,11 +2637,10 @@ | |
| 2637 | bHasStatus = pFstat->n>1; |
| 2638 | } |
| 2639 | style_set_current_feature("forum"); |
| 2640 | style_header("%s%s", db_get("forum-title","Forum"), |
| 2641 | isSearch ? " Search Results" : ""); |
| 2642 | if( g.perm.WrForum ){ |
| 2643 | style_submenu_element("New Thread","%R/forumnew"); |
| 2644 | }else{ |
| 2645 | style_submenu_element("New Thread","%R/login"); |
| 2646 | } |
| @@ -2678,10 +2677,16 @@ | |
| 2677 | zStatusFilter = 0; |
| 2678 | }else{ |
| 2679 | bFilter = bHasStatus; |
| 2680 | } |
| 2681 | } |
| 2682 | if( bFilter ){ |
| 2683 | style_submenu_element("Timeline", |
| 2684 | "%R/timeline?ss=v&y=f&status=%t", zStatusFilter); |
| 2685 | }else{ |
| 2686 | style_submenu_element("Timeline", "%R/timeline?ss=v&y=f"); |
| 2687 | } |
| 2688 | if( bHasForum ){ |
| 2689 | Stmt qStat = empty_Stmt; /* Query to get status information */ |
| 2690 | if( bHasStatus ){ |
| 2691 | /* The qStat query runs once for each output row generate by the |
| 2692 | ** q query. It determines the value and label of the status for |
| 2693 |