github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

null-checking in date display for approved sites.

pull/477/head
William Kim 2013-08-12 15:52:30 -04:00
parent d67a492b6c
commit c1607b53e4
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
openid-connect-server/src/main/webapp/resources/js/grant.js
View File

@ -118,21 +118,36 @@ var ApprovedSiteView = Backbone.View.extend({
render: function() {
var creationDate = moment(this.model.get("creationDate"));
var accessDate = moment(this.model.get("accessDate"));
var creationDate = this.model.get("creationDate");
var accessDate = this.model.get("accessDate");
var timeoutDate = this.model.get("timeoutDate");
var timeoutDate = moment(this.model.get("timeoutDate")).calendar();
if (moment().diff(creationDate, 'months') < 6) {
creationDate = creationDate.fromNow();
if (creationDate == null) {
creationDate = "Unknown";
} else {
creationDate = creationDate.format("MMMM Do, YYYY");
creationDate = moment(creationDate);
if (moment().diff(creationDate, 'months') < 6) {
creationDate = creationDate.fromNow();
} else {
creationDate = creationDate.format("MMMM Do, YYYY");
}
}
if (moment().diff(accessDate, 'months') < 6) {
accessDate = accessDate.fromNow();
if (accessDate == null) {
accessDate = "Unknown";
} else {
accessDate = accessDate.format("MMMM Do, YYYY");
accessDate = moment(accessDate);
if (moment().diff(accessDate, 'months') < 6) {
accessDate = accessDate.fromNow();
} else {
accessDate = accessDate.format("MMMM Do, YYYY");
}
}
if (timeoutDate == null) {
timeoutDate = "Never";
} else {
timeoutDate = moment(timeoutDate).calendar();
}
var formattedDate = {creationDate: creationDate, accessDate: accessDate, timeoutDate: timeoutDate};