hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-16 14:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle NULL created column of api_tokens table

Browse Source
This commit is contained in:
Daisuke Taniwaki
2018-06-02 23:55:21 +09:00
parent 784e5aa4ee
commit 690b07982e
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/jupyterhub/static/js/token.js
View File

@@ -12,7 +12,7 @@ require(["jquery", "jhapi", "moment"], function($, JHAPI, moment) {
// convert ISO datestamps to nice momentjs ones // convert ISO datestamps to nice momentjs ones
el = $(el); el = $(el);
let m = moment(new Date(el.text().trim())); let m = moment(new Date(el.text().trim()));
el.text(m.isValid() ? m.fromNow() : "Never"); el.text(m.isValid() ? m.fromNow() : el.text());
}); });
$("#request-token-form").submit(function() { $("#request-token-form").submit(function() {

8
share/jupyterhub/templates/token.html
View File

@@ -73,7 +73,11 @@
{%- endif -%} {%- endif -%}
</td> </td>
<td class="time-col col-sm-3"> <td class="time-col col-sm-3">
{%- if token.created -%}
{{ token.created.isoformat() + 'Z' }} {{ token.created.isoformat() + 'Z' }}
{%- else -%}
N/A
{%- endif -%}
</td> </td>
<td class="col-sm-1 text-center"> <td class="col-sm-1 text-center">
<button class="revoke-token-btn btn btn-xs btn-danger">revoke</button> <button class="revoke-token-btn btn btn-xs btn-danger">revoke</button>
@@ -118,7 +122,11 @@
{%- endif -%} {%- endif -%}
</td> </td>
<td class="time-col col-sm-3"> <td class="time-col col-sm-3">
{%- if client['created'] -%}
{{ client['created'].isoformat() + 'Z' }} {{ client['created'].isoformat() + 'Z' }}
{%- else -%}
N/A
{%- endif -%}
</td> </td>
<td class="col-sm-1 text-center"> <td class="col-sm-1 text-center">
<button class="revoke-token-btn btn btn-xs btn-danger">revoke</a> <button class="revoke-token-btn btn btn-xs btn-danger">revoke</a>