diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js index dd2d2e8e83..e4737d2937 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js @@ -244,6 +244,7 @@ define(function(require) { }; var color_html = Status.state_lock_to_color("SERVICE",state, element_json[XML_ROOT]["LOCK"]); + var start_time = element.TEMPLATE.BODY["start_time"] ? Humanize.prettyTime(element.TEMPLATE.BODY["start_time"]) : "-"; return [ "'+color_html, @@ -115,7 +116,7 @@ define(function(require) { element.UNAME, element.GNAME, element.NAME, - Humanize.prettyTime(element.TEMPLATE.BODY['registration_time']), + registration_time, (LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''), btoa(unescape(encodeURIComponent(JSON.stringify(search)))) ]; diff --git a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js index e58b704939..4d09af4f8a 100644 --- a/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js @@ -67,7 +67,7 @@ define(function(require) { var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME); var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element); - var prettyRegTime = Humanize.prettyTime(this.element.TEMPLATE.BODY['registration_time']); + var prettyRegTime = this.element.TEMPLATE.BODY['registration_time'] ? Humanize.prettyTime(this.element.TEMPLATE.BODY['registration_time']) : "-"; var customAttrs = []; if ( ! $.isEmptyObject( this.element.TEMPLATE.BODY['custom_attrs'] ) ) {