Fossil SCM

Make a hyperlink to the Artifact Receipt log from the "Received From" field of the /info page (visible to administrators only).

drh 2019-10-23 00:46 trunk
Commit a92d5a514d7ffd5e3b2b8f04d486cf543c414b8456b4e82bc3f12394e7a018e1
1 file changed +5 -2
+5 -2
--- src/info.c
+++ src/info.c
@@ -830,22 +830,25 @@
830830
hyperlink_to_user(zOrigUser,zOrigDate," on ");
831831
hyperlink_to_date(zOrigDate, "</td></tr>");
832832
}
833833
if( g.perm.Admin ){
834834
db_prepare(&q2,
835
- "SELECT rcvfrom.ipaddr, user.login, datetime(rcvfrom.mtime)"
835
+ "SELECT rcvfrom.ipaddr, user.login, datetime(rcvfrom.mtime),"
836
+ " blob.rcvid"
836837
" FROM blob JOIN rcvfrom USING(rcvid) LEFT JOIN user USING(uid)"
837838
" WHERE blob.rid=%d",
838839
rid
839840
);
840841
if( db_step(&q2)==SQLITE_ROW ){
841842
const char *zIpAddr = db_column_text(&q2, 0);
842843
const char *zUser = db_column_text(&q2, 1);
843844
const char *zDate = db_column_text(&q2, 2);
845
+ int rcvid = db_column_int(&q2,3);
844846
if( zUser==0 || zUser[0]==0 ) zUser = "unknown";
845847
@ <tr><th>Received&nbsp;From:</th>
846
- @ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate)</td></tr>
848
+ @ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate) \
849
+ @ (<a href="%R/rcvfrom?rcvid=%d(rcvid)">Rcvid %d(rcvid)</a>)</td></tr>
847850
}
848851
db_finalize(&q2);
849852
}
850853
851854
/* Only show links to read wiki pages if the users can read wiki
852855
--- src/info.c
+++ src/info.c
@@ -830,22 +830,25 @@
830 hyperlink_to_user(zOrigUser,zOrigDate," on ");
831 hyperlink_to_date(zOrigDate, "</td></tr>");
832 }
833 if( g.perm.Admin ){
834 db_prepare(&q2,
835 "SELECT rcvfrom.ipaddr, user.login, datetime(rcvfrom.mtime)"
 
836 " FROM blob JOIN rcvfrom USING(rcvid) LEFT JOIN user USING(uid)"
837 " WHERE blob.rid=%d",
838 rid
839 );
840 if( db_step(&q2)==SQLITE_ROW ){
841 const char *zIpAddr = db_column_text(&q2, 0);
842 const char *zUser = db_column_text(&q2, 1);
843 const char *zDate = db_column_text(&q2, 2);
 
844 if( zUser==0 || zUser[0]==0 ) zUser = "unknown";
845 @ <tr><th>Received&nbsp;From:</th>
846 @ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate)</td></tr>
 
847 }
848 db_finalize(&q2);
849 }
850
851 /* Only show links to read wiki pages if the users can read wiki
852
--- src/info.c
+++ src/info.c
@@ -830,22 +830,25 @@
830 hyperlink_to_user(zOrigUser,zOrigDate," on ");
831 hyperlink_to_date(zOrigDate, "</td></tr>");
832 }
833 if( g.perm.Admin ){
834 db_prepare(&q2,
835 "SELECT rcvfrom.ipaddr, user.login, datetime(rcvfrom.mtime),"
836 " blob.rcvid"
837 " FROM blob JOIN rcvfrom USING(rcvid) LEFT JOIN user USING(uid)"
838 " WHERE blob.rid=%d",
839 rid
840 );
841 if( db_step(&q2)==SQLITE_ROW ){
842 const char *zIpAddr = db_column_text(&q2, 0);
843 const char *zUser = db_column_text(&q2, 1);
844 const char *zDate = db_column_text(&q2, 2);
845 int rcvid = db_column_int(&q2,3);
846 if( zUser==0 || zUser[0]==0 ) zUser = "unknown";
847 @ <tr><th>Received&nbsp;From:</th>
848 @ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate) \
849 @ (<a href="%R/rcvfrom?rcvid=%d(rcvid)">Rcvid %d(rcvid)</a>)</td></tr>
850 }
851 db_finalize(&q2);
852 }
853
854 /* Only show links to read wiki pages if the users can read wiki
855

Keyboard Shortcuts

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