From 977dbbb120637e3fa08cee2d1b419c2d31030f65 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 13 Apr 2015 08:12:34 +0000
Subject: [PATCH] Fix to store the table configuration correctly.
SVN: 33808
---
.../newbrowser/html/js/views/DataGrid/DataGridController.js | 6 +++++-
.../views/SampleHierarchyTable/SampleHierarchyTableView.js | 2 +-
.../html/js/views/TrashManager/TrashManagerView.js | 2 +-
.../newbrowser/html/js/views/UserManager/UserManagerView.js | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js
index 1a4b92752a1..e35542bae8d 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js
@@ -20,6 +20,10 @@ function DataGridController(title, columns, data, rowClickEventHandler, showAllC
this._dataGridView = null;
var _this = this;
+ if(!configKey) {
+ window.alert("This view created a table without configKey, please report it to the developers.");
+ }
+
this.init = function($container) {
var webAppId = "ELN-LIMS";
mainController.serverFacade.openbisServer.getWebAppSettings(webAppId, function(response) {
@@ -39,7 +43,7 @@ function DataGridController(title, columns, data, rowClickEventHandler, showAllC
mainController.serverFacade.openbisServer.setWebAppSettings(webAppSettings, function(result) {});
}
var tableSettings = null;
- if(settings[configKey]) {
+ if(configKey && settings[configKey]) {
tableSettings = JSON.parse(settings[configKey]);
}
_this._grid = new Grid(columns, data, showAllColumns, tableSettings, onColumnsChange);
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js
index 72a6e81d9b7..09712746a9c 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js
@@ -103,7 +103,7 @@ function SampleHierarchyTableView(controller, model) {
mainController.changeView('showViewSamplePageFromPermId', e.data.permId);
}
- this._dataGrid = new DataGridController(null, columns, getDataList, rowClick);
+ this._dataGrid = new DataGridController(null, columns, getDataList, rowClick, false, "SAMPLE_HIERARCHY_TABLE");
this._dataGrid.init(this._container);
this._container.prepend($("<legend>").append(" Sample Hierarchy"));
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/TrashManager/TrashManagerView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/TrashManager/TrashManagerView.js
index f396069fb64..c05d18c1a74 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/TrashManager/TrashManagerView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/TrashManager/TrashManagerView.js
@@ -171,7 +171,7 @@ function TrashManagerView(trashManagerController, trashManagerModel) {
}
var dataGridContainer = $("<div>");
- var dataGrid = new DataGridController(null, columns, getDataList, null);
+ var dataGrid = new DataGridController(null, columns, getDataList, null, true, "TRASHCAN_TABLE");
dataGrid.init(dataGridContainer);
$containerColumn.append(dataGridContainer);
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/UserManagerView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/UserManagerView.js
index 0cc1823bd71..d69da49d13c 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/UserManagerView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/UserManager/UserManagerView.js
@@ -123,7 +123,7 @@ function UserManagerView(userManagerController, userManagerModel) {
callback(dataList);
}
- var dataGrid = new DataGridController(null, columns, getDataList, null);
+ var dataGrid = new DataGridController(null, columns, getDataList, null, false, "USER_MANAGER_TABLE");
dataGrid.init(dataGridContainer);
//
--
GitLab