colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #907 from BookStackApp/fix/date-image-manager 

Changes the way the date is displayed in image-manager.
This commit is contained in:
Abijeet Patro 2018-07-02 00:34:30 +05:30 committed by GitHub
parent 84b4fe6176 f5df5ac7d5
commit c2d6e98985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/assets/js/services/dates.js
View File

@ -12,4 +12,13 @@ export function utcTimeStampToLocalTime(timestamp) {
let hours = date.getHours();
let mins = date.getMinutes();
return `${(hours>9?'':'0') + hours}:${(mins>9?'':'0') + mins}`;
}
export function formatDateTime(date) {
let month = date.getMonth() + 1;
let day = date.getDate();
let hours = date.getHours();
let mins = date.getMinutes();
return `${date.getFullYear()}-${(month>9?'':'0') + month}-${(day>9?'':'0') + day} ${(hours>9?'':'0') + hours}:${(mins>9?'':'0') + mins}`;
}

5
resources/assets/js/vues/image-manager.js
View File

@ -1,3 +1,6 @@
import * as Dates from "../services/dates";
const dropzone = require('./components/dropzone');
let page = 0;
@ -168,7 +171,7 @@ const methods = {
},
getDate(stringDate) {
return new Date(stringDate);
return Dates.formatDateTime(new Date(stringDate));
},
uploadSuccess(event) {