diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html index 155af9499b87587e351e00a847ccdc579b41f7dc..a48d597185b83466215c040d3a8091dcbcbf6c1c 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html @@ -55,7 +55,7 @@ <script type="text/javascript" src="./lib/jquery-history/js/bundled/html5/jquery.history.js"></script> <script type="text/javascript" src="./lib/jquery-tooltipster/js/jquery.tooltipster.min.js"></script> <script type="text/javascript" src="./lib/jquery-tsv/js/jquery.tsv-0.96.min.js"></script> - <script type="text/javascript" src="./lib/fuelux/js/fuelux.min.js"></script> + <script type="text/javascript" src="./lib/fuelux/js/fuelux.js"></script> <script type="text/javascript" src="./lib/d3/js/d3.min.js"></script> <script type="text/javascript" src="./lib/d3-dagre/js/dagre-d3.min.js"></script> <script type="text/javascript" src="./lib/naturalsort/js/naturalSort.js"></script> diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/fuelux/js/fuelux.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/fuelux/js/fuelux.js index 55e582f086e64227e5fb6af94a85366fa859f06e..56616ab40ccf64ff413aff63c7b7b1516bb17837 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/fuelux/js/fuelux.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/fuelux/js/fuelux.js @@ -5551,8 +5551,12 @@ return true; } else { for ( j in newCols[ i ] ) { - if ( oldCols[ i ][ j ] !== newCols[ i ][ j ] ) { - return true; + if ( oldCols[ i ][ j ] !== newCols[ i ][ j ]) { + if(oldCols[ i ][ j ] && newCols[ i ][ j ] && (oldCols[ i ][ j ].name !== newCols[ i ][ j ].name)) { + return true; + } else if(!oldCols[ i ][ j ] && newCols[ i ][ j ] || oldCols[ i ][ j ] && !newCols[ i ][ j ]) { + return true; + } } } } diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js index 7dc0026878da75a16090c4a851c3692d1aba731e..202d48452809353339b5fb4e1501568a1bb9af0b 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js @@ -634,7 +634,7 @@ $.extend(Grid.prototype, { //HACK: Fixes extra headers added on this fuelux 3.1.0 when rendering again var tableHeads = $(thisGrid.panel).find('thead'); if(tableHeads.length > 1) { - for(var hIdx = 1; hIdx < tableHeads.length; hIdx++) { + for(var hIdx = 0; hIdx < tableHeads.length -1; hIdx++) { var bugHeader = $(tableHeads[hIdx]); bugHeader.remove(); }