Fossil SCM
Make the 'n=all' query parameter work as expected for the /timeline?p= and /timeline?d= web pages.
Commit
9eae2e5c1bbe4e9dc20cf2b3d7b3053a0791cb0808e071df37e9d5d31bc109b9
Parent
cfe761679c70cbd…
1 file changed
+2
-2
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1820,19 +1820,19 @@ | ||
| 1820 | 1820 | zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", |
| 1821 | 1821 | p_rid ? p_rid : d_rid); |
| 1822 | 1822 | blob_append_sql(&sql, " AND event.objid IN ok"); |
| 1823 | 1823 | nd = 0; |
| 1824 | 1824 | if( d_rid ){ |
| 1825 | - compute_descendants(d_rid, nEntry+1); | |
| 1825 | + compute_descendants(d_rid, nEntry==0 ? 0 : nEntry+1); | |
| 1826 | 1826 | nd = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1827 | 1827 | if( nd>=0 ) db_multi_exec("%s", blob_sql_text(&sql)); |
| 1828 | 1828 | if( nd>0 ) blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s"); |
| 1829 | 1829 | if( useDividers ) selectedRid = d_rid; |
| 1830 | 1830 | db_multi_exec("DELETE FROM ok"); |
| 1831 | 1831 | } |
| 1832 | 1832 | if( p_rid ){ |
| 1833 | - compute_ancestors(p_rid, nEntry+1, 0); | |
| 1833 | + compute_ancestors(p_rid, nEntry==0 ? 0 : nEntry+1, 0); | |
| 1834 | 1834 | np = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1835 | 1835 | if( np>0 ){ |
| 1836 | 1836 | if( nd>0 ) blob_appendf(&desc, " and "); |
| 1837 | 1837 | blob_appendf(&desc, "%d ancestors", np); |
| 1838 | 1838 | db_multi_exec("%s", blob_sql_text(&sql)); |
| 1839 | 1839 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1820,19 +1820,19 @@ | |
| 1820 | zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", |
| 1821 | p_rid ? p_rid : d_rid); |
| 1822 | blob_append_sql(&sql, " AND event.objid IN ok"); |
| 1823 | nd = 0; |
| 1824 | if( d_rid ){ |
| 1825 | compute_descendants(d_rid, nEntry+1); |
| 1826 | nd = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1827 | if( nd>=0 ) db_multi_exec("%s", blob_sql_text(&sql)); |
| 1828 | if( nd>0 ) blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s"); |
| 1829 | if( useDividers ) selectedRid = d_rid; |
| 1830 | db_multi_exec("DELETE FROM ok"); |
| 1831 | } |
| 1832 | if( p_rid ){ |
| 1833 | compute_ancestors(p_rid, nEntry+1, 0); |
| 1834 | np = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1835 | if( np>0 ){ |
| 1836 | if( nd>0 ) blob_appendf(&desc, " and "); |
| 1837 | blob_appendf(&desc, "%d ancestors", np); |
| 1838 | db_multi_exec("%s", blob_sql_text(&sql)); |
| 1839 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1820,19 +1820,19 @@ | |
| 1820 | zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", |
| 1821 | p_rid ? p_rid : d_rid); |
| 1822 | blob_append_sql(&sql, " AND event.objid IN ok"); |
| 1823 | nd = 0; |
| 1824 | if( d_rid ){ |
| 1825 | compute_descendants(d_rid, nEntry==0 ? 0 : nEntry+1); |
| 1826 | nd = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1827 | if( nd>=0 ) db_multi_exec("%s", blob_sql_text(&sql)); |
| 1828 | if( nd>0 ) blob_appendf(&desc, "%d descendant%s", nd,(1==nd)?"":"s"); |
| 1829 | if( useDividers ) selectedRid = d_rid; |
| 1830 | db_multi_exec("DELETE FROM ok"); |
| 1831 | } |
| 1832 | if( p_rid ){ |
| 1833 | compute_ancestors(p_rid, nEntry==0 ? 0 : nEntry+1, 0); |
| 1834 | np = db_int(0, "SELECT count(*)-1 FROM ok"); |
| 1835 | if( np>0 ){ |
| 1836 | if( nd>0 ) blob_appendf(&desc, " and "); |
| 1837 | blob_appendf(&desc, "%d ancestors", np); |
| 1838 | db_multi_exec("%s", blob_sql_text(&sql)); |
| 1839 |