Fossil SCM
Two fixes about localtime: * The ci_edit page tells the user that it asks UTC time * The object_description gives links to localtime (if it's set in the config). Otherwise the links were not pointing at the concerning checkin.
Commit
1765c18d94da3fe513aeeb7f1a9ef72ac8ed38c7
Parent
0cf5416002ca011…
1 file changed
+4
-4
+4
-4
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -780,11 +780,11 @@ | ||
| 780 | 780 | char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 781 | 781 | |
| 782 | 782 | char *prevName = 0; |
| 783 | 783 | |
| 784 | 784 | db_prepare(&q, |
| 785 | - "SELECT filename.name, datetime(event.mtime)," | |
| 785 | + "SELECT filename.name, datetime(event.mtime, 'localtime')," | |
| 786 | 786 | " coalesce(event.ecomment,event.comment)," |
| 787 | 787 | " coalesce(event.euser,event.user)," |
| 788 | 788 | " b.uuid, mlink.mperm," |
| 789 | 789 | " coalesce((SELECT value FROM tagxref" |
| 790 | 790 | " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')" |
| @@ -850,11 +850,11 @@ | ||
| 850 | 850 | } |
| 851 | 851 | @ </ul></ul> |
| 852 | 852 | free(prevName); |
| 853 | 853 | db_finalize(&q); |
| 854 | 854 | db_prepare(&q, |
| 855 | - "SELECT substr(tagname, 6, 10000), datetime(event.mtime)," | |
| 855 | + "SELECT substr(tagname, 6, 10000), datetime(event.mtime, 'localtime')," | |
| 856 | 856 | " coalesce(event.euser, event.user)" |
| 857 | 857 | " FROM tagxref, tag, event" |
| 858 | 858 | " WHERE tagxref.rid=%d" |
| 859 | 859 | " AND tag.tagid=tagxref.tagid" |
| 860 | 860 | " AND tag.tagname LIKE 'wiki-%%'" |
| @@ -926,11 +926,11 @@ | ||
| 926 | 926 | cnt++; |
| 927 | 927 | } |
| 928 | 928 | db_finalize(&q); |
| 929 | 929 | } |
| 930 | 930 | db_prepare(&q, |
| 931 | - "SELECT target, filename, datetime(mtime), user, src" | |
| 931 | + "SELECT target, filename, datetime(mtime,'localtime'), user, src" | |
| 932 | 932 | " FROM attachment" |
| 933 | 933 | " WHERE src=(SELECT uuid FROM blob WHERE rid=%d)" |
| 934 | 934 | " ORDER BY mtime DESC /*sort*/", |
| 935 | 935 | rid |
| 936 | 936 | ); |
| @@ -1798,11 +1798,11 @@ | ||
| 1798 | 1798 | @ <tr><td align="right" valign="top"><b>Comment:</b></td> |
| 1799 | 1799 | @ <td valign="top"> |
| 1800 | 1800 | @ <textarea name="c" rows="10" cols="80">%h(zNewComment)</textarea> |
| 1801 | 1801 | @ </td></tr> |
| 1802 | 1802 | |
| 1803 | - @ <tr><td align="right" valign="top"><b>Check-in Time:</b></td> | |
| 1803 | + @ <tr><td align="right" valign="top"><b>Check-in UTC Time:</b></td> | |
| 1804 | 1804 | @ <td valign="top"> |
| 1805 | 1805 | @ <input type="text" name="dt" size="20" value="%h(zNewDate)" /> |
| 1806 | 1806 | @ </td></tr> |
| 1807 | 1807 | |
| 1808 | 1808 | @ <tr><td align="right" valign="top"><b>Background Color:</b></td> |
| 1809 | 1809 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -780,11 +780,11 @@ | |
| 780 | char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 781 | |
| 782 | char *prevName = 0; |
| 783 | |
| 784 | db_prepare(&q, |
| 785 | "SELECT filename.name, datetime(event.mtime)," |
| 786 | " coalesce(event.ecomment,event.comment)," |
| 787 | " coalesce(event.euser,event.user)," |
| 788 | " b.uuid, mlink.mperm," |
| 789 | " coalesce((SELECT value FROM tagxref" |
| 790 | " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')" |
| @@ -850,11 +850,11 @@ | |
| 850 | } |
| 851 | @ </ul></ul> |
| 852 | free(prevName); |
| 853 | db_finalize(&q); |
| 854 | db_prepare(&q, |
| 855 | "SELECT substr(tagname, 6, 10000), datetime(event.mtime)," |
| 856 | " coalesce(event.euser, event.user)" |
| 857 | " FROM tagxref, tag, event" |
| 858 | " WHERE tagxref.rid=%d" |
| 859 | " AND tag.tagid=tagxref.tagid" |
| 860 | " AND tag.tagname LIKE 'wiki-%%'" |
| @@ -926,11 +926,11 @@ | |
| 926 | cnt++; |
| 927 | } |
| 928 | db_finalize(&q); |
| 929 | } |
| 930 | db_prepare(&q, |
| 931 | "SELECT target, filename, datetime(mtime), user, src" |
| 932 | " FROM attachment" |
| 933 | " WHERE src=(SELECT uuid FROM blob WHERE rid=%d)" |
| 934 | " ORDER BY mtime DESC /*sort*/", |
| 935 | rid |
| 936 | ); |
| @@ -1798,11 +1798,11 @@ | |
| 1798 | @ <tr><td align="right" valign="top"><b>Comment:</b></td> |
| 1799 | @ <td valign="top"> |
| 1800 | @ <textarea name="c" rows="10" cols="80">%h(zNewComment)</textarea> |
| 1801 | @ </td></tr> |
| 1802 | |
| 1803 | @ <tr><td align="right" valign="top"><b>Check-in Time:</b></td> |
| 1804 | @ <td valign="top"> |
| 1805 | @ <input type="text" name="dt" size="20" value="%h(zNewDate)" /> |
| 1806 | @ </td></tr> |
| 1807 | |
| 1808 | @ <tr><td align="right" valign="top"><b>Background Color:</b></td> |
| 1809 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -780,11 +780,11 @@ | |
| 780 | char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 781 | |
| 782 | char *prevName = 0; |
| 783 | |
| 784 | db_prepare(&q, |
| 785 | "SELECT filename.name, datetime(event.mtime, 'localtime')," |
| 786 | " coalesce(event.ecomment,event.comment)," |
| 787 | " coalesce(event.euser,event.user)," |
| 788 | " b.uuid, mlink.mperm," |
| 789 | " coalesce((SELECT value FROM tagxref" |
| 790 | " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')" |
| @@ -850,11 +850,11 @@ | |
| 850 | } |
| 851 | @ </ul></ul> |
| 852 | free(prevName); |
| 853 | db_finalize(&q); |
| 854 | db_prepare(&q, |
| 855 | "SELECT substr(tagname, 6, 10000), datetime(event.mtime, 'localtime')," |
| 856 | " coalesce(event.euser, event.user)" |
| 857 | " FROM tagxref, tag, event" |
| 858 | " WHERE tagxref.rid=%d" |
| 859 | " AND tag.tagid=tagxref.tagid" |
| 860 | " AND tag.tagname LIKE 'wiki-%%'" |
| @@ -926,11 +926,11 @@ | |
| 926 | cnt++; |
| 927 | } |
| 928 | db_finalize(&q); |
| 929 | } |
| 930 | db_prepare(&q, |
| 931 | "SELECT target, filename, datetime(mtime,'localtime'), user, src" |
| 932 | " FROM attachment" |
| 933 | " WHERE src=(SELECT uuid FROM blob WHERE rid=%d)" |
| 934 | " ORDER BY mtime DESC /*sort*/", |
| 935 | rid |
| 936 | ); |
| @@ -1798,11 +1798,11 @@ | |
| 1798 | @ <tr><td align="right" valign="top"><b>Comment:</b></td> |
| 1799 | @ <td valign="top"> |
| 1800 | @ <textarea name="c" rows="10" cols="80">%h(zNewComment)</textarea> |
| 1801 | @ </td></tr> |
| 1802 | |
| 1803 | @ <tr><td align="right" valign="top"><b>Check-in UTC Time:</b></td> |
| 1804 | @ <td valign="top"> |
| 1805 | @ <input type="text" name="dt" size="20" value="%h(zNewDate)" /> |
| 1806 | @ </td></tr> |
| 1807 | |
| 1808 | @ <tr><td align="right" valign="top"><b>Background Color:</b></td> |
| 1809 |