From c127cee6e6402bc9bc6b019c4c11fc300011b87b Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 11 Nov 2016 16:11:10 +0000
Subject: [PATCH] SSDM-2597 : bugfix, avoiding grid to loose columns when
add/remove new/old columns
SVN: 37316
---
.../eln-lims/1/as/webapps/eln-lims/html/index.html | 2 +-
.../1/as/webapps/eln-lims/html/lib/fuelux/js/fuelux.js | 8 ++++++--
.../1/as/webapps/eln-lims/html/lib/grid/js/Grid.js | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
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 155af9499b8..a48d597185b 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 55e582f086e..56616ab40cc 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 7dc0026878d..202d4845280 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();
}
--
GitLab