diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js index fd03630f3c0069e6bfcc43da2fcb92eae426dbb5..0e8a774979f10b88959c3a7daa3246bd324d6302 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js @@ -712,9 +712,9 @@ function MainController(profile) { //Show View var localInstance = this; this.serverFacade.searchWithUniqueId(permId, function(data) { - var content = localInstance._getBackwardsCompatibleMainContainer(); + var views = localInstance._getNewViewModel(true, true, false); var sampleHierarchyTableController = new SampleHierarchyTableController(this, data[0]); - sampleHierarchyTableController.init(content); + sampleHierarchyTableController.init(views); localInstance.currentView = sampleHierarchyTableController; }); } diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableController.js index 654d938b99786a98d8db26147f7278c5cabe28b5..9e4ed9385b7cf0e0c4ad1b9cf42c5e135f574e9b 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableController.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableController.js @@ -19,8 +19,8 @@ function SampleHierarchyTableController(parentController, sample) { this._model = new SampleHierarchyTableModel(sample); this._view = new SampleHierarchyTableView(this, this._model); - this.init = function($container) { - this._view.repaint($container); + this.init = function(views) { + this._view.repaint(views); } } \ No newline at end of file diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js index 46f5491805a48eeb39afc1874f7503bc0e069780..669104590b82fdfcbdd27471b14f1336afc7ddc5 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js @@ -21,24 +21,23 @@ function SampleHierarchyTableView(controller, model) { this._dataGrid; this._hierarchyFilterController; - this.repaint = function($container) { + this.repaint = function(views) { var _this = this; - $container.empty(); + var $containerColumn = $("<form>", { "class" : "form-horizontal", 'role' : "form", "action" : "javascript:void(0);", "onsubmit" : "" }); - $container.append($containerColumn); + $containerColumn.append(this._container); + views.content.append($containerColumn); - $containerColumn.append($("<h1>").append("" + ELNDictionary.Sample + " Hierarchy Table for " + this._model.sample.identifier)); - this._hierarchyFilterController = new HierarchyFilterController(this._model.sample, function() { - _this._dataGrid.refresh(); - }); - this._hierarchyFilterController.init($containerColumn); + views.header.append($("<h1>").append("" + ELNDictionary.Sample + " Hierarchy Table for " + this._model.sample.identifier)); + this._hierarchyFilterController = new HierarchyFilterController(this._model.sample, function() { _this._dataGrid.refresh(); }); + this._hierarchyFilterController.init(views.header); this._showHierarchy(); - $containerColumn.append(this._container); + } this._showHierarchy = function() {