diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js index bba902538dfcd033e171b5c7038adc92aa6261cf..abe1f6a5f5f8894947ba94217ee69ec86823fcd8 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js @@ -307,11 +307,6 @@ function MainController(profile) { this._showSampleHierarchyTablePage(arg); window.scrollTo(0,0); break; - case "showCreateSamplePage": - document.title = "Create Sample " + arg; - this._showCreateSamplePage(arg); - window.scrollTo(0,0); - break; case "showEditSamplePageFromPermId": var _this = this; this.serverFacade.searchWithUniqueId(arg, function(data) { @@ -498,17 +493,6 @@ function MainController(profile) { sampleFormController.init($("#mainContainer")); } - this._showCreateSamplePage = function(sampleTypeCode) { - //Show Form - var sample = { - sampleTypeCode : sampleTypeCode, - properties : {} - } - var sampleFormController = new SampleFormController(this, FormMode.CREATE, sample); - this.currentView = sampleFormController; - sampleFormController.init($("#mainContainer")); - } - this._showTrashcan = function() { var trashcanController = new TrashManagerController(this); this.trashcanController = trashcanController; diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleHierarchy.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleHierarchy.js index d2d621262c7dcf517cd3bf26b93b773a17a73fb5..83bca9f5b73d78aadc5aac2ac49a4568ef6b0af4 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleHierarchy.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleHierarchy.js @@ -175,9 +175,8 @@ function SampleHierarchy(serverFacade, containerId, profile, sample) { var _this = this; $("#sampleTypeSelector").on("change", function(event) { var sampleTypeCode = $("#sampleTypeSelector")[0].value; - mainController.changeView('showCreateSamplePage', sampleTypeCode); _this.serverFacade.searchWithUniqueId(permId, function(data) { - + mainController.changeView('showCreateSubExperimentPage', "{\"sampleTypeCode\":\"" + sampleTypeCode + "\",\"experimentIdentifier\":\"" + data[0].experimentIdentifierOrNull + "\"}"); var setParent = function() { mainController.currentView._sampleFormModel.sampleLinksParents.addSample(data[0]); Util.unblockUI();