a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename field to revision_timestamp in edit history

Browse Source
This commit is contained in:
Maciej Ziarkowski 2020-01-23 10:31:20 +00:00
parent fd78724203
commit 88d1032e13
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/api/services/building.ts
View File

@ -118,7 +118,7 @@ async function getBuildingById(id: number) {
async function getBuildingEditHistory(id: number) { async function getBuildingEditHistory(id: number) {
try { try {
return await db.manyOrNone( return await db.manyOrNone(
`SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp), username `SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp) as revision_timestamp, username
FROM logs, users FROM logs, users
WHERE building_id = $1 AND logs.user_id = users.user_id WHERE building_id = $1 AND logs.user_id = users.user_id
ORDER BY log_timestamp DESC`, ORDER BY log_timestamp DESC`,

2
app/src/api/services/editHistory.ts
View File

@ -3,7 +3,7 @@ import db from '../../db';
async function getGlobalEditHistory() { async function getGlobalEditHistory() {
try { try {
return await db.manyOrNone( return await db.manyOrNone(
`SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp), username, building_id `SELECT log_id as revision_id, forward_patch, reverse_patch, date_trunc('minute', log_timestamp) as revision_timestamp, username, building_id
FROM logs, users FROM logs, users
WHERE logs.user_id = users.user_id WHERE logs.user_id = users.user_id
AND log_timestamp >= now() - interval '7 days' AND log_timestamp >= now() - interval '7 days'

2
app/src/frontend/building/edit-history/building-edit-summary.tsx
View File

@ -54,7 +54,7 @@ const BuildingEditSummary: React.FunctionComponent<BuildingEditSummaryProps> = (
return ( return (
<div className="edit-history-entry"> <div className="edit-history-entry">
<h2 className="edit-history-timestamp">Edited on {formatDate(parseDate(historyEntry.date_trunc))}</h2> <h2 className="edit-history-timestamp">Edited on {formatDate(parseDate(historyEntry.revision_timestamp))}</h2>
<h3 className="edit-history-username">By {historyEntry.username}</h3> <h3 className="edit-history-username">By {historyEntry.username}</h3>
{ {
showBuildingId && historyEntry.building_id != undefined && showBuildingId && historyEntry.building_id != undefined &&

2
app/src/frontend/models/edit-history-entry.ts
View File

@ -1,5 +1,5 @@
export interface EditHistoryEntry { export interface EditHistoryEntry {
date_trunc: string; revision_timestamp: string;
username: string; username: string;
revision_id: string; revision_id: string;
forward_patch: object; forward_patch: object;