From 2bae794c2ceb219c2979f1e44737dea4c86736d0 Mon Sep 17 00:00:00 2001 From: jrtechs Date: Sun, 17 Feb 2019 08:39:44 -0500 Subject: [PATCH] Fixed errors with orgs table and timeline table displaying null for homepage. --- public/js/createOrgInfo.js | 6 +++++- public/js/profileTimeLine.js | 25 ++++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/public/js/createOrgInfo.js b/public/js/createOrgInfo.js index 00564bc..85e824d 100644 --- a/public/js/createOrgInfo.js +++ b/public/js/createOrgInfo.js @@ -13,7 +13,11 @@ function createOrgInfo(orgName, container) { " $("#" + container).html(html); - $('#dataTable').DataTable(); + + setTimeout(function() { + $('#dataTable').DataTable(); + }, 1500); + }, function(error) { alert("Organization Does Not Exist"); window.location.href = "./GraphGenerator.html"; diff --git a/public/js/profileTimeLine.js b/public/js/profileTimeLine.js index 443d567..700e8ec 100644 --- a/public/js/profileTimeLine.js +++ b/public/js/profileTimeLine.js @@ -74,18 +74,21 @@ function timeLineClickEvent(properties) "
Liscense
\n" + "
" + item.license.name + - "
\n" + - " \n" + - "
  • \n" + - "
    Home Page
    \n" + - "
    " + - "" +item.homepage + "" + - "
    \n" + - "
  • \n" + - " \n" + - " "; + ""; + if(item.homepage !== null) + { + html += + "
  • \n" + + "
    Home Page
    \n" + + "
    " + + "" +item.homepage + "" + + "
    \n" + + "
  • \n" + + " \n"; + } + - html += "
    \n" + + html += "
    \n" + "