Fossil SCM
Do not limit the number of rows shown in a timeline using the n= query parameter if any of the yw=, ymd=, or days= query parameters are present.
Commit
58804979ab3bc93706041f100f55e321ac09659cc763dd5089c460e7d3934f5d
Parent
d5fd4e2681fd007…
1 file changed
+3
+3
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1785,24 +1785,27 @@ | ||
| 1785 | 1785 | "SELECT strftime('%%Y-%%W','now','-6 days','weekday 1')"); |
| 1786 | 1786 | } |
| 1787 | 1787 | } |
| 1788 | 1788 | blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%W',event.mtime) ", |
| 1789 | 1789 | zYearWeek); |
| 1790 | + nEntry = -1; | |
| 1790 | 1791 | } |
| 1791 | 1792 | else if( zDay ){ |
| 1792 | 1793 | zDay = db_text(0, "SELECT date(%Q)", zDay); |
| 1793 | 1794 | if( zDay==0 || zDay[0]==0 ){ |
| 1794 | 1795 | zDay = db_text(0, "SELECT date('now')"); |
| 1795 | 1796 | } |
| 1796 | 1797 | blob_append_sql(&cond, " AND %Q=date(event.mtime) ", |
| 1797 | 1798 | zDay); |
| 1799 | + nEntry = -1; | |
| 1798 | 1800 | } |
| 1799 | 1801 | else if( zNDays ){ |
| 1800 | 1802 | nDays = atoi(zNDays); |
| 1801 | 1803 | if( nDays<1 ) nDays = 1; |
| 1802 | 1804 | blob_append_sql(&cond, " AND event.mtime>=julianday('now','-%d days') ", |
| 1803 | 1805 | nDays); |
| 1806 | + nEntry = -1; | |
| 1804 | 1807 | } |
| 1805 | 1808 | if( zTagSql ){ |
| 1806 | 1809 | blob_append_sql(&cond, |
| 1807 | 1810 | " AND (EXISTS(SELECT 1 FROM tagxref NATURAL JOIN tag" |
| 1808 | 1811 | " WHERE %s AND tagtype>0 AND rid=blob.rid)\n", zTagSql/*safe-for-%s*/); |
| 1809 | 1812 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1785,24 +1785,27 @@ | |
| 1785 | "SELECT strftime('%%Y-%%W','now','-6 days','weekday 1')"); |
| 1786 | } |
| 1787 | } |
| 1788 | blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%W',event.mtime) ", |
| 1789 | zYearWeek); |
| 1790 | } |
| 1791 | else if( zDay ){ |
| 1792 | zDay = db_text(0, "SELECT date(%Q)", zDay); |
| 1793 | if( zDay==0 || zDay[0]==0 ){ |
| 1794 | zDay = db_text(0, "SELECT date('now')"); |
| 1795 | } |
| 1796 | blob_append_sql(&cond, " AND %Q=date(event.mtime) ", |
| 1797 | zDay); |
| 1798 | } |
| 1799 | else if( zNDays ){ |
| 1800 | nDays = atoi(zNDays); |
| 1801 | if( nDays<1 ) nDays = 1; |
| 1802 | blob_append_sql(&cond, " AND event.mtime>=julianday('now','-%d days') ", |
| 1803 | nDays); |
| 1804 | } |
| 1805 | if( zTagSql ){ |
| 1806 | blob_append_sql(&cond, |
| 1807 | " AND (EXISTS(SELECT 1 FROM tagxref NATURAL JOIN tag" |
| 1808 | " WHERE %s AND tagtype>0 AND rid=blob.rid)\n", zTagSql/*safe-for-%s*/); |
| 1809 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1785,24 +1785,27 @@ | |
| 1785 | "SELECT strftime('%%Y-%%W','now','-6 days','weekday 1')"); |
| 1786 | } |
| 1787 | } |
| 1788 | blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%W',event.mtime) ", |
| 1789 | zYearWeek); |
| 1790 | nEntry = -1; |
| 1791 | } |
| 1792 | else if( zDay ){ |
| 1793 | zDay = db_text(0, "SELECT date(%Q)", zDay); |
| 1794 | if( zDay==0 || zDay[0]==0 ){ |
| 1795 | zDay = db_text(0, "SELECT date('now')"); |
| 1796 | } |
| 1797 | blob_append_sql(&cond, " AND %Q=date(event.mtime) ", |
| 1798 | zDay); |
| 1799 | nEntry = -1; |
| 1800 | } |
| 1801 | else if( zNDays ){ |
| 1802 | nDays = atoi(zNDays); |
| 1803 | if( nDays<1 ) nDays = 1; |
| 1804 | blob_append_sql(&cond, " AND event.mtime>=julianday('now','-%d days') ", |
| 1805 | nDays); |
| 1806 | nEntry = -1; |
| 1807 | } |
| 1808 | if( zTagSql ){ |
| 1809 | blob_append_sql(&cond, |
| 1810 | " AND (EXISTS(SELECT 1 FROM tagxref NATURAL JOIN tag" |
| 1811 | " WHERE %s AND tagtype>0 AND rid=blob.rid)\n", zTagSql/*safe-for-%s*/); |
| 1812 |