Skip to content

Commit

Permalink
fix(ui): fix issue #762, introduced in df54014
Browse files Browse the repository at this point in the history
see also:
- df54014#commitcomment-36950304
- #762

closes #762

Signed-off-by: Maximilian Huber <maximilian.huber@tngtech.com>
  • Loading branch information
maxhbr committed Jan 27, 2020
1 parent adbd21d commit da677b5
Showing 1 changed file with 16 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<portlet:param name="<%=PortalConstants.LICENSE_ID%>" value="<%=PortalConstants.FRIENDLY_URL_PLACEHOLDER_ID%>"/>
</liferay-portlet:renderURL>

div class="container" style="display: none;">
<div class="container" style="display: none;">
<div class="row">
<div class="col-3 sidebar">
<div class="card-deck">
Expand Down Expand Up @@ -164,6 +164,12 @@ div class="container" style="display: none;">

<%--for javascript library loading --%>
<%@ include file="/html/utils/includes/requirejs.jspf" %>
<script>
var renderCallback = function () {
};
var dataGetter = function(field) {
};
</script>
<script>
AUI().use('liferay-portlet-url', function () {
var PortletURL = Liferay.PortletURL;
Expand Down Expand Up @@ -215,13 +221,20 @@ div class="container" style="display: none;">
// create and render data table
function createComponentsTable() {
var columnDefs = [];
let columns = [
{"title": "Vendor", data: "vndrs"},
{"title": "Component Name", data: "name", render: {display: renderComponentNameLink}},
{"title": "Main Licenses", data: "lics", render: {display: renderLicenseLink}},
{"title": "Component Type", data: "cType"},
{"title": "Actions", data: "id", render: {display: renderComponentActions}, className: 'two actions', orderable: false }
];
let printColumns = [0, 1, 2, 3];
var componentsTable = datatables.create('#componentsTable', {
bServerSide: true,
sAjaxSource: '<%=sw360ComponentsURL%>',
columns: columns,
columnDefs: columnDefs,
columnDefs: [],
drawCallback: renderCallback,
initComplete: datatables.showPageContainer,
order: [
Expand Down

0 comments on commit da677b5

Please sign in to comment.