Fossil SCM

Make artifact|whatis page use local time to match the timeline. Otherwise clicking on date/time links finds the wrong check-in in the timeline

andygoth 2016-11-12 04:21 trunk
Commit e7192bb975d00e3b99d070c7ff688b8f1beda32f
Parent 3af5165a9024bd1…
1 file changed +5 -5
~ src/info.c
M src/info.c
+5 -5
--- src/info.c
+++ src/info.c
@@ -1207,11 +1207,11 @@
12071207
 char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
12081208
 int showDetail = (objdescFlags & OBJDESC_DETAIL)!=0;
12091209
 char *prevName = 0;
12101210
12111211
 db_prepare(&q,
1212
- "SELECT filename.name, datetime(event.mtime),"
1212
+ "SELECT filename.name, datetime(event.mtime,toLocal()),"
12131213
 " coalesce(event.ecomment,event.comment),"
12141214
 " coalesce(event.euser,event.user),"
12151215
 " b.uuid, mlink.mperm,"
12161216
 " coalesce((SELECT value FROM tagxref"
12171217
 " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')"
@@ -1295,11 +1295,11 @@
12951295
 }
12961296
 @ </ul>
12971297
 free(prevName);
12981298
 db_finalize(&q);
12991299
 db_prepare(&q,
1300
- "SELECT substr(tagname, 6, 10000), datetime(event.mtime),"
1300
+ "SELECT substr(tagname, 6, 10000), datetime(event.mtime, toLocal()),"
13011301
 " coalesce(event.euser, event.user)"
13021302
 " FROM tagxref, tag, event"
13031303
 " WHERE tagxref.rid=%d"
13041304
 " AND tag.tagid=tagxref.tagid"
13051305
 " AND tag.tagname LIKE 'wiki-%%'"
@@ -1326,11 +1326,11 @@
13261326
 }
13271327
 }
13281328
 db_finalize(&q);
13291329
 if( nWiki==0 ){
13301330
 db_prepare(&q,
1331
- "SELECT datetime(mtime), user, comment, type, uuid, tagid"
1331
+ "SELECT datetime(mtime, toLocal()), user, comment, type, uuid, tagid"
13321332
 " FROM event, blob"
13331333
 " WHERE event.objid=%d"
13341334
 " AND blob.rid=%d",
13351335
 rid, rid
13361336
 );
@@ -1377,11 +1377,11 @@
13771377
 cnt++;
13781378
 }
13791379
 db_finalize(&q);
13801380
 }
13811381
 db_prepare(&q,
1382
- "SELECT target, filename, datetime(mtime), user, src"
1382
+ "SELECT target, filename, datetime(mtime, toLocal()), user, src"
13831383
 " FROM attachment"
13841384
 " WHERE src=(SELECT uuid FROM blob WHERE rid=%d)"
13851385
 " ORDER BY mtime DESC /*sort*/",
13861386
 rid
13871387
 );
@@ -1912,11 +1912,11 @@
19121912
 }
19131913
 if( g.perm.Admin ){
19141914
 Stmt q;
19151915
 db_prepare(&q,
19161916
 "SELECT coalesce(user.login,rcvfrom.uid),"
1917
- " datetime(rcvfrom.mtime), rcvfrom.ipaddr"
1917
+ " datetime(rcvfrom.mtime,toLocal()), rcvfrom.ipaddr"
19181918
 " FROM blob, rcvfrom LEFT JOIN user ON user.uid=rcvfrom.uid"
19191919
 " WHERE blob.rid=%d"
19201920
 " AND rcvfrom.rcvid=blob.rcvid;", rid);
19211921
 while( db_step(&q)==SQLITE_ROW ){
19221922
 const char *zUser = db_column_text(&q,0);
19231923
--- src/info.c
+++ src/info.c
@@ -1207,11 +1207,11 @@
1207 char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
1208 int showDetail = (objdescFlags & OBJDESC_DETAIL)!=0;
1209 char *prevName = 0;
1210
1211 db_prepare(&q,
1212 "SELECT filename.name, datetime(event.mtime),"
1213 " coalesce(event.ecomment,event.comment),"
1214 " coalesce(event.euser,event.user),"
1215 " b.uuid, mlink.mperm,"
1216 " coalesce((SELECT value FROM tagxref"
1217 " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')"
@@ -1295,11 +1295,11 @@
1295 }
1296 @ </ul>
1297 free(prevName);
1298 db_finalize(&q);
1299 db_prepare(&q,
1300 "SELECT substr(tagname, 6, 10000), datetime(event.mtime),"
1301 " coalesce(event.euser, event.user)"
1302 " FROM tagxref, tag, event"
1303 " WHERE tagxref.rid=%d"
1304 " AND tag.tagid=tagxref.tagid"
1305 " AND tag.tagname LIKE 'wiki-%%'"
@@ -1326,11 +1326,11 @@
1326 }
1327 }
1328 db_finalize(&q);
1329 if( nWiki==0 ){
1330 db_prepare(&q,
1331 "SELECT datetime(mtime), user, comment, type, uuid, tagid"
1332 " FROM event, blob"
1333 " WHERE event.objid=%d"
1334 " AND blob.rid=%d",
1335 rid, rid
1336 );
@@ -1377,11 +1377,11 @@
1377 cnt++;
1378 }
1379 db_finalize(&q);
1380 }
1381 db_prepare(&q,
1382 "SELECT target, filename, datetime(mtime), user, src"
1383 " FROM attachment"
1384 " WHERE src=(SELECT uuid FROM blob WHERE rid=%d)"
1385 " ORDER BY mtime DESC /*sort*/",
1386 rid
1387 );
@@ -1912,11 +1912,11 @@
1912 }
1913 if( g.perm.Admin ){
1914 Stmt q;
1915 db_prepare(&q,
1916 "SELECT coalesce(user.login,rcvfrom.uid),"
1917 " datetime(rcvfrom.mtime), rcvfrom.ipaddr"
1918 " FROM blob, rcvfrom LEFT JOIN user ON user.uid=rcvfrom.uid"
1919 " WHERE blob.rid=%d"
1920 " AND rcvfrom.rcvid=blob.rcvid;", rid);
1921 while( db_step(&q)==SQLITE_ROW ){
1922 const char *zUser = db_column_text(&q,0);
1923
--- src/info.c
+++ src/info.c
@@ -1207,11 +1207,11 @@
1207 char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
1208 int showDetail = (objdescFlags & OBJDESC_DETAIL)!=0;
1209 char *prevName = 0;
1210
1211 db_prepare(&q,
1212 "SELECT filename.name, datetime(event.mtime,toLocal()),"
1213 " coalesce(event.ecomment,event.comment),"
1214 " coalesce(event.euser,event.user),"
1215 " b.uuid, mlink.mperm,"
1216 " coalesce((SELECT value FROM tagxref"
1217 " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')"
@@ -1295,11 +1295,11 @@
1295 }
1296 @ </ul>
1297 free(prevName);
1298 db_finalize(&q);
1299 db_prepare(&q,
1300 "SELECT substr(tagname, 6, 10000), datetime(event.mtime, toLocal()),"
1301 " coalesce(event.euser, event.user)"
1302 " FROM tagxref, tag, event"
1303 " WHERE tagxref.rid=%d"
1304 " AND tag.tagid=tagxref.tagid"
1305 " AND tag.tagname LIKE 'wiki-%%'"
@@ -1326,11 +1326,11 @@
1326 }
1327 }
1328 db_finalize(&q);
1329 if( nWiki==0 ){
1330 db_prepare(&q,
1331 "SELECT datetime(mtime, toLocal()), user, comment, type, uuid, tagid"
1332 " FROM event, blob"
1333 " WHERE event.objid=%d"
1334 " AND blob.rid=%d",
1335 rid, rid
1336 );
@@ -1377,11 +1377,11 @@
1377 cnt++;
1378 }
1379 db_finalize(&q);
1380 }
1381 db_prepare(&q,
1382 "SELECT target, filename, datetime(mtime, toLocal()), user, src"
1383 " FROM attachment"
1384 " WHERE src=(SELECT uuid FROM blob WHERE rid=%d)"
1385 " ORDER BY mtime DESC /*sort*/",
1386 rid
1387 );
@@ -1912,11 +1912,11 @@
1912 }
1913 if( g.perm.Admin ){
1914 Stmt q;
1915 db_prepare(&q,
1916 "SELECT coalesce(user.login,rcvfrom.uid),"
1917 " datetime(rcvfrom.mtime,toLocal()), rcvfrom.ipaddr"
1918 " FROM blob, rcvfrom LEFT JOIN user ON user.uid=rcvfrom.uid"
1919 " WHERE blob.rid=%d"
1920 " AND rcvfrom.rcvid=blob.rcvid;", rid);
1921 while( db_step(&q)==SQLITE_ROW ){
1922 const char *zUser = db_column_text(&q,0);
1923

Keyboard Shortcuts

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