Fossil SCM

Rename the 'hide' query parameter to 'nohidden' for the /leaves, /brtimeline, and /tagtimeline web pages.

florian 2018-12-26 11:12 fix-timeline-view
Commit 5359e3db1fa9d259a703a7be15ca8dd92e24428da8a33a24dde8350616eccc79
Parent 8bf8b37828e6ab8…
3 files changed +4 -4 +5 -5 +4 -4
~ src/branch.c ~ src/descendants.c ~ src/tag.c
M src/branch.c
+4 -4
--- src/branch.c
+++ src/branch.c
@@ -617,20 +617,20 @@
617617
 ** Show a timeline of all branches
618618
 **
619619
 ** Query parameters:
620620
 **
621621
 ** ng No graph
622
-** hide Hide check-ins with "hidden" tag
622
+** nohidden Hide check-ins with "hidden" tag
623623
 ** onlyhidden Show only check-ins with "hidden" tag
624624
 ** brbg Background color by branch name
625625
 ** ubg Background color by user name
626626
 */
627627
 void brtimeline_page(void){
628628
 Blob sql = empty_blob;
629629
 Stmt q;
630630
 int tmFlags; /* Timeline display flags */
631
- int fHide = PB("hide")!=0; /* The "hide" query parameter */
631
+ int fNoHidden = PB("nohidden")!=0; /* The "nohidden" query parameter */
632632
 int fOnlyHidden = PB("onlyhidden")!=0; /* The "onlyhidden" query parameter */
633633
634634
 login_check_credentials();
635635
 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
636636
@@ -642,12 +642,12 @@
642642
 @ <h2>The initial check-in for each branch:</h2>
643643
 blob_append(&sql, timeline_query_for_www(), -1);
644644
 blob_append_sql(&sql,
645645
 "AND blob.rid IN (SELECT rid FROM tagxref"
646646
 " WHERE tagtype>0 AND tagid=%d AND srcid!=0)", TAG_BRANCH);
647
- if( fHide || fOnlyHidden ){
648
- const char* zUnaryOp = fHide ? "NOT" : "";
647
+ if( fNoHidden || fOnlyHidden ){
648
+ const char* zUnaryOp = fNoHidden ? "NOT" : "";
649649
 blob_append_sql(&sql,
650650
 " AND %s EXISTS(SELECT 1 FROM tagxref"
651651
 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
652652
 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
653653
 }
654654
--- src/branch.c
+++ src/branch.c
@@ -617,20 +617,20 @@
617 ** Show a timeline of all branches
618 **
619 ** Query parameters:
620 **
621 ** ng No graph
622 ** hide Hide check-ins with "hidden" tag
623 ** onlyhidden Show only check-ins with "hidden" tag
624 ** brbg Background color by branch name
625 ** ubg Background color by user name
626 */
627 void brtimeline_page(void){
628 Blob sql = empty_blob;
629 Stmt q;
630 int tmFlags; /* Timeline display flags */
631 int fHide = PB("hide")!=0; /* The "hide" query parameter */
632 int fOnlyHidden = PB("onlyhidden")!=0; /* The "onlyhidden" query parameter */
633
634 login_check_credentials();
635 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
636
@@ -642,12 +642,12 @@
642 @ <h2>The initial check-in for each branch:</h2>
643 blob_append(&sql, timeline_query_for_www(), -1);
644 blob_append_sql(&sql,
645 "AND blob.rid IN (SELECT rid FROM tagxref"
646 " WHERE tagtype>0 AND tagid=%d AND srcid!=0)", TAG_BRANCH);
647 if( fHide || fOnlyHidden ){
648 const char* zUnaryOp = fHide ? "NOT" : "";
649 blob_append_sql(&sql,
650 " AND %s EXISTS(SELECT 1 FROM tagxref"
651 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
652 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
653 }
654
--- src/branch.c
+++ src/branch.c
@@ -617,20 +617,20 @@
617 ** Show a timeline of all branches
618 **
619 ** Query parameters:
620 **
621 ** ng No graph
622 ** nohidden Hide check-ins with "hidden" tag
623 ** onlyhidden Show only check-ins with "hidden" tag
624 ** brbg Background color by branch name
625 ** ubg Background color by user name
626 */
627 void brtimeline_page(void){
628 Blob sql = empty_blob;
629 Stmt q;
630 int tmFlags; /* Timeline display flags */
631 int fNoHidden = PB("nohidden")!=0; /* The "nohidden" query parameter */
632 int fOnlyHidden = PB("onlyhidden")!=0; /* The "onlyhidden" query parameter */
633
634 login_check_credentials();
635 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
636
@@ -642,12 +642,12 @@
642 @ <h2>The initial check-in for each branch:</h2>
643 blob_append(&sql, timeline_query_for_www(), -1);
644 blob_append_sql(&sql,
645 "AND blob.rid IN (SELECT rid FROM tagxref"
646 " WHERE tagtype>0 AND tagid=%d AND srcid!=0)", TAG_BRANCH);
647 if( fNoHidden || fOnlyHidden ){
648 const char* zUnaryOp = fNoHidden ? "NOT" : "";
649 blob_append_sql(&sql,
650 " AND %s EXISTS(SELECT 1 FROM tagxref"
651 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
652 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
653 }
654
M src/descendants.c
+5 -5
--- src/descendants.c
+++ src/descendants.c
@@ -455,11 +455,11 @@
455455
 ** Query parameters:
456456
 **
457457
 ** all Show all leaves
458458
 ** closed Show only closed leaves
459459
 ** ng No graph
460
-** hide Hide check-ins with "hidden" tag
460
+** nohidden Hide check-ins with "hidden" tag
461461
 ** onlyhidden Show only check-ins with "hidden" tag
462462
 ** brbg Background color by branch name
463463
 ** ubg Background color by user name
464464
 */
465465
 void leaves_page(void){
@@ -466,11 +466,11 @@
466466
 Blob sql;
467467
 Stmt q;
468468
 int showAll = P("all")!=0;
469469
 int showClosed = P("closed")!=0;
470470
 int fNg = PB("ng")!=0; /* Flag for the "ng" query parameter */
471
- int fHide = PB("hide")!=0; /* Flag for the "hide" query parameter */
471
+ int fNoHidden = PB("nohidden")!=0; /* "nohidden" query parameter */
472472
 int fOnlyHidden = PB("onlyhidden")!=0; /* "onlyhidden" query parameter */
473473
 int fBrBg = PB("brbg")!=0; /* Flag for the "brbg" query parameter */
474474
 int fUBg = PB("ubg")!=0; /* Flag for the "ubg" query parameter */
475475
 HQuery url; /* URL to /leaves plus query parameters */
476476
 int tmFlags; /* Timeline display flags */
@@ -477,11 +477,11 @@
477477
478478
 login_check_credentials();
479479
 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
480480
 url_initialize(&url, "leaves");
481481
 if( fNg ) url_add_parameter(&url, "ng", "");
482
- if( fHide ) url_add_parameter(&url, "hide", "");
482
+ if( fNoHidden ) url_add_parameter(&url, "nohidden", "");
483483
 if( fOnlyHidden ) url_add_parameter(&url, "onlyhidden", "");
484484
 if( fBrBg ) url_add_parameter(&url, "brbg", "");
485485
 if( fUBg ) url_add_parameter(&url, "ubg", "");
486486
 if( !showAll ){
487487
 style_submenu_element("All", "%s", url_render(&url, "all", "", 0, 0));
@@ -525,12 +525,12 @@
525525
 if( showClosed ){
526526
 blob_append_sql(&sql," AND %z", leaf_is_closed_sql("blob.rid"));
527527
 }else if( !showAll ){
528528
 blob_append_sql(&sql," AND NOT %z", leaf_is_closed_sql("blob.rid"));
529529
 }
530
- if( fHide || fOnlyHidden ){
531
- const char* zUnaryOp = fHide ? "NOT" : "";
530
+ if( fNoHidden || fOnlyHidden ){
531
+ const char* zUnaryOp = fNoHidden ? "NOT" : "";
532532
 blob_append_sql(&sql,
533533
 " AND %s EXISTS(SELECT 1 FROM tagxref"
534534
 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
535535
 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
536536
 }
537537
--- src/descendants.c
+++ src/descendants.c
@@ -455,11 +455,11 @@
455 ** Query parameters:
456 **
457 ** all Show all leaves
458 ** closed Show only closed leaves
459 ** ng No graph
460 ** hide Hide check-ins with "hidden" tag
461 ** onlyhidden Show only check-ins with "hidden" tag
462 ** brbg Background color by branch name
463 ** ubg Background color by user name
464 */
465 void leaves_page(void){
@@ -466,11 +466,11 @@
466 Blob sql;
467 Stmt q;
468 int showAll = P("all")!=0;
469 int showClosed = P("closed")!=0;
470 int fNg = PB("ng")!=0; /* Flag for the "ng" query parameter */
471 int fHide = PB("hide")!=0; /* Flag for the "hide" query parameter */
472 int fOnlyHidden = PB("onlyhidden")!=0; /* "onlyhidden" query parameter */
473 int fBrBg = PB("brbg")!=0; /* Flag for the "brbg" query parameter */
474 int fUBg = PB("ubg")!=0; /* Flag for the "ubg" query parameter */
475 HQuery url; /* URL to /leaves plus query parameters */
476 int tmFlags; /* Timeline display flags */
@@ -477,11 +477,11 @@
477
478 login_check_credentials();
479 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
480 url_initialize(&url, "leaves");
481 if( fNg ) url_add_parameter(&url, "ng", "");
482 if( fHide ) url_add_parameter(&url, "hide", "");
483 if( fOnlyHidden ) url_add_parameter(&url, "onlyhidden", "");
484 if( fBrBg ) url_add_parameter(&url, "brbg", "");
485 if( fUBg ) url_add_parameter(&url, "ubg", "");
486 if( !showAll ){
487 style_submenu_element("All", "%s", url_render(&url, "all", "", 0, 0));
@@ -525,12 +525,12 @@
525 if( showClosed ){
526 blob_append_sql(&sql," AND %z", leaf_is_closed_sql("blob.rid"));
527 }else if( !showAll ){
528 blob_append_sql(&sql," AND NOT %z", leaf_is_closed_sql("blob.rid"));
529 }
530 if( fHide || fOnlyHidden ){
531 const char* zUnaryOp = fHide ? "NOT" : "";
532 blob_append_sql(&sql,
533 " AND %s EXISTS(SELECT 1 FROM tagxref"
534 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
535 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
536 }
537
--- src/descendants.c
+++ src/descendants.c
@@ -455,11 +455,11 @@
455 ** Query parameters:
456 **
457 ** all Show all leaves
458 ** closed Show only closed leaves
459 ** ng No graph
460 ** nohidden Hide check-ins with "hidden" tag
461 ** onlyhidden Show only check-ins with "hidden" tag
462 ** brbg Background color by branch name
463 ** ubg Background color by user name
464 */
465 void leaves_page(void){
@@ -466,11 +466,11 @@
466 Blob sql;
467 Stmt q;
468 int showAll = P("all")!=0;
469 int showClosed = P("closed")!=0;
470 int fNg = PB("ng")!=0; /* Flag for the "ng" query parameter */
471 int fNoHidden = PB("nohidden")!=0; /* "nohidden" query parameter */
472 int fOnlyHidden = PB("onlyhidden")!=0; /* "onlyhidden" query parameter */
473 int fBrBg = PB("brbg")!=0; /* Flag for the "brbg" query parameter */
474 int fUBg = PB("ubg")!=0; /* Flag for the "ubg" query parameter */
475 HQuery url; /* URL to /leaves plus query parameters */
476 int tmFlags; /* Timeline display flags */
@@ -477,11 +477,11 @@
477
478 login_check_credentials();
479 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
480 url_initialize(&url, "leaves");
481 if( fNg ) url_add_parameter(&url, "ng", "");
482 if( fNoHidden ) url_add_parameter(&url, "nohidden", "");
483 if( fOnlyHidden ) url_add_parameter(&url, "onlyhidden", "");
484 if( fBrBg ) url_add_parameter(&url, "brbg", "");
485 if( fUBg ) url_add_parameter(&url, "ubg", "");
486 if( !showAll ){
487 style_submenu_element("All", "%s", url_render(&url, "all", "", 0, 0));
@@ -525,12 +525,12 @@
525 if( showClosed ){
526 blob_append_sql(&sql," AND %z", leaf_is_closed_sql("blob.rid"));
527 }else if( !showAll ){
528 blob_append_sql(&sql," AND NOT %z", leaf_is_closed_sql("blob.rid"));
529 }
530 if( fNoHidden || fOnlyHidden ){
531 const char* zUnaryOp = fNoHidden ? "NOT" : "";
532 blob_append_sql(&sql,
533 " AND %s EXISTS(SELECT 1 FROM tagxref"
534 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
535 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
536 }
537
M src/tag.c
+4 -4
--- src/tag.c
+++ src/tag.c
@@ -689,20 +689,20 @@
689689
 ** symbolic tags.
690690
 **
691691
 ** Query parameters:
692692
 **
693693
 ** ng No graph
694
-** hide Hide check-ins with "hidden" tag
694
+** nohidden Hide check-ins with "hidden" tag
695695
 ** onlyhidden Show only check-ins with "hidden" tag
696696
 ** brbg Background color by branch name
697697
 ** ubg Background color by user name
698698
 */
699699
 void tagtimeline_page(void){
700700
 Blob sql = empty_blob;
701701
 Stmt q;
702702
 int tmFlags; /* Timeline display flags */
703
- int fHide = PB("hide")!=0; /* The "hide" query parameter */
703
+ int fNoHidden = PB("nohidden")!=0; /* The "nohidden" query parameter */
704704
 int fOnlyHidden = PB("onlyhidden")!=0; /* The "onlyhidden" query parameter */
705705
706706
 login_check_credentials();
707707
 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
708708
@@ -716,12 +716,12 @@
716716
 blob_append_sql(&sql,
717717
 "AND blob.rid IN (SELECT rid FROM tagxref"
718718
 " WHERE tagtype=1 AND srcid>0"
719719
 " AND tagid IN (SELECT tagid FROM tag "
720720
 " WHERE tagname GLOB 'sym-*'))");
721
- if( fHide || fOnlyHidden ){
722
- const char* zUnaryOp = fHide ? "NOT" : "";
721
+ if( fNoHidden || fOnlyHidden ){
722
+ const char* zUnaryOp = fNoHidden ? "NOT" : "";
723723
 blob_append_sql(&sql,
724724
 " AND %s EXISTS(SELECT 1 FROM tagxref"
725725
 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
726726
 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
727727
 }
728728
--- src/tag.c
+++ src/tag.c
@@ -689,20 +689,20 @@
689 ** symbolic tags.
690 **
691 ** Query parameters:
692 **
693 ** ng No graph
694 ** hide Hide check-ins with "hidden" tag
695 ** onlyhidden Show only check-ins with "hidden" tag
696 ** brbg Background color by branch name
697 ** ubg Background color by user name
698 */
699 void tagtimeline_page(void){
700 Blob sql = empty_blob;
701 Stmt q;
702 int tmFlags; /* Timeline display flags */
703 int fHide = PB("hide")!=0; /* The "hide" query parameter */
704 int fOnlyHidden = PB("onlyhidden")!=0; /* The "onlyhidden" query parameter */
705
706 login_check_credentials();
707 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
708
@@ -716,12 +716,12 @@
716 blob_append_sql(&sql,
717 "AND blob.rid IN (SELECT rid FROM tagxref"
718 " WHERE tagtype=1 AND srcid>0"
719 " AND tagid IN (SELECT tagid FROM tag "
720 " WHERE tagname GLOB 'sym-*'))");
721 if( fHide || fOnlyHidden ){
722 const char* zUnaryOp = fHide ? "NOT" : "";
723 blob_append_sql(&sql,
724 " AND %s EXISTS(SELECT 1 FROM tagxref"
725 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
726 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
727 }
728
--- src/tag.c
+++ src/tag.c
@@ -689,20 +689,20 @@
689 ** symbolic tags.
690 **
691 ** Query parameters:
692 **
693 ** ng No graph
694 ** nohidden Hide check-ins with "hidden" tag
695 ** onlyhidden Show only check-ins with "hidden" tag
696 ** brbg Background color by branch name
697 ** ubg Background color by user name
698 */
699 void tagtimeline_page(void){
700 Blob sql = empty_blob;
701 Stmt q;
702 int tmFlags; /* Timeline display flags */
703 int fNoHidden = PB("nohidden")!=0; /* The "nohidden" query parameter */
704 int fOnlyHidden = PB("onlyhidden")!=0; /* The "onlyhidden" query parameter */
705
706 login_check_credentials();
707 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
708
@@ -716,12 +716,12 @@
716 blob_append_sql(&sql,
717 "AND blob.rid IN (SELECT rid FROM tagxref"
718 " WHERE tagtype=1 AND srcid>0"
719 " AND tagid IN (SELECT tagid FROM tag "
720 " WHERE tagname GLOB 'sym-*'))");
721 if( fNoHidden || fOnlyHidden ){
722 const char* zUnaryOp = fNoHidden ? "NOT" : "";
723 blob_append_sql(&sql,
724 " AND %s EXISTS(SELECT 1 FROM tagxref"
725 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n",
726 zUnaryOp/*safe-for-%s*/, TAG_HIDDEN);
727 }
728

Keyboard Shortcuts

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