vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[MIN] Fix datetime creation

Browse source
This commit is contained in:
Achilles Rasquinha 2018-01-05 13:35:21 +05:30
parent 25ecf977da
commit a110444d1b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frappe/public/js/frappe/chat.js
View file

@ -949,14 +949,14 @@ frappe.chat.pretty_datetime = function (date)
{
const today = moment()
const instance = date.moment
if ( today.isSame(instance, "d") )
return today.format("hh:mm A")
return instance.format("hh:mm A")
else
if ( today.isSame(instance, "week") )
return today.format("dddd")
return instance.format("dddd")
else
return today.format("DD/MM/YYYY")
return instance.format("DD/MM/YYYY")
}
// frappe.chat.sound
@ -1931,7 +1931,9 @@ class extends Component
}
if ( props.last_message )
{
item.timestamp = frappe.chat.pretty_datetime(props.last_message.creation)
}
return (
h("li", null,