paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Show local time instead of UTC in invitations tab.

Browse Source
This commit is contained in:
snlkapil
2017-12-18 23:23:03 -08:00
committed by showell
parent 27a8ef86e4
commit 1589c597d2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/settings_invites.js
View File

@@ -24,6 +24,7 @@ function populate_invites(invites_data) {
list_render(invites_table, invites_data.invites, {
name: "admin_invites_list",
modifier: function (item) {
item.invited = timerender.absolute_time(item.invited * 1000);
return templates.render("admin_invites_list", { invite: item });
},
filter: {
@@ -139,6 +140,7 @@ exports.on_load_success = function (invites_data) {
success: function (data) {
resend_button.text(i18n.t("Sent!"));
resend_button.removeClass('resend btn-warning').addClass('sea-green');
data.timestamp = timerender.absolute_time(data.timestamp * 1000);
meta.current_resend_invite_user_modal_row.find(".invited_at").text(data.timestamp);
},
});

6
zerver/lib/actions.py
View File

@@ -4025,7 +4025,7 @@ def do_get_user_invites(user_profile: UserProfile) -> List[Dict[str, Any]]:
for invitee in prereg_users:
invites.append(dict(email=invitee.email,
ref=invitee.referred_by.email,
invited=invitee.invited_at.strftime("%Y-%m-%d %H:%M:%S"),
invited=datetime_to_timestamp(invitee.invited_at),
id=invitee.id,
invited_as_admin=invitee.invited_as_admin))
@@ -4044,7 +4044,7 @@ def do_revoke_user_invite(prereg_user: PreregistrationUser) -> None:
prereg_user.delete()
clear_scheduled_invitation_emails(email)
def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> str:
def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> int:
check_invite_limit(prereg_user.referred_by, 1)
prereg_user.invited_at = timezone_now()
@@ -4058,7 +4058,7 @@ def do_resend_user_invite_email(prereg_user: PreregistrationUser) -> str:
event = {"prereg_id": prereg_user.id, "referrer_id": prereg_user.referred_by.id, "email_body": None}
queue_json_publish("invites", event)
return prereg_user.invited_at.strftime("%Y-%m-%d %H:%M:%S")
return datetime_to_timestamp(prereg_user.invited_at)
def notify_realm_emoji(realm: Realm) -> None:
event = dict(type="realm_emoji", op="update",