Fossil SCM

Restore operation of "related" and "tag filter" widgets

drh 2019-11-28 10:23 trunk merge
Commit 820d70512aaf58b58fc1eedf609f85c924d27fa841f6043a9606271ce2bb06ed
1 file changed +6 -1
+6 -1
--- src/timeline.c
+++ src/timeline.c
@@ -1682,12 +1682,15 @@
16821682
" ORDER BY event.mtime LIMIT 1",
16831683
P("cf")
16841684
);
16851685
}
16861686
1687
- /* r=TAG works like a combination of t=TAG & rel */
1687
+ /* Convert r=TAG to t=TAG&rel in order to populate the UI style widgets. */
16881688
if( zBrName && !related ){
1689
+ cgi_delete_query_parameter("r");
1690
+ cgi_set_query_parameter("t", zBrName);
1691
+ cgi_set_query_parameter("rel", "1");
16891692
zTagName = zBrName;
16901693
related = 1;
16911694
zType = "ci";
16921695
}
16931696
@@ -2399,10 +2402,12 @@
23992402
if( zBrName ){
24002403
if( !PB("nowiki")
24012404
&& wiki_render_associated("branch", zBrName, WIKIASSOC_ALL)
24022405
){
24032406
@ <div class="section">%b(&desc)</div>
2407
+ } else{
2408
+ @ <h2>%b(&desc)</h2>
24042409
}
24052410
style_submenu_element("Diff", "%R/vdiff?branch=%T", zBrName);
24062411
}else
24072412
if( zTagName
24082413
&& matchStyle==MS_EXACT
24092414
--- src/timeline.c
+++ src/timeline.c
@@ -1682,12 +1682,15 @@
1682 " ORDER BY event.mtime LIMIT 1",
1683 P("cf")
1684 );
1685 }
1686
1687 /* r=TAG works like a combination of t=TAG & rel */
1688 if( zBrName && !related ){
 
 
 
1689 zTagName = zBrName;
1690 related = 1;
1691 zType = "ci";
1692 }
1693
@@ -2399,10 +2402,12 @@
2399 if( zBrName ){
2400 if( !PB("nowiki")
2401 && wiki_render_associated("branch", zBrName, WIKIASSOC_ALL)
2402 ){
2403 @ <div class="section">%b(&desc)</div>
 
 
2404 }
2405 style_submenu_element("Diff", "%R/vdiff?branch=%T", zBrName);
2406 }else
2407 if( zTagName
2408 && matchStyle==MS_EXACT
2409
--- src/timeline.c
+++ src/timeline.c
@@ -1682,12 +1682,15 @@
1682 " ORDER BY event.mtime LIMIT 1",
1683 P("cf")
1684 );
1685 }
1686
1687 /* Convert r=TAG to t=TAG&rel in order to populate the UI style widgets. */
1688 if( zBrName && !related ){
1689 cgi_delete_query_parameter("r");
1690 cgi_set_query_parameter("t", zBrName);
1691 cgi_set_query_parameter("rel", "1");
1692 zTagName = zBrName;
1693 related = 1;
1694 zType = "ci";
1695 }
1696
@@ -2399,10 +2402,12 @@
2402 if( zBrName ){
2403 if( !PB("nowiki")
2404 && wiki_render_associated("branch", zBrName, WIKIASSOC_ALL)
2405 ){
2406 @ <div class="section">%b(&desc)</div>
2407 } else{
2408 @ <h2>%b(&desc)</h2>
2409 }
2410 style_submenu_element("Diff", "%R/vdiff?branch=%T", zBrName);
2411 }else
2412 if( zTagName
2413 && matchStyle==MS_EXACT
2414

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button