diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js index a638786ce0ad0c00474ce1b96190ed7294d9363d..f4dcd50045e538e0b4538f0c80574845d2183ad6 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js @@ -50,11 +50,16 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod this.storage = null; this.dataSetViewer = null; this.isFormDirty = false; + this.isFormLoaded = false; this.isDirty = function() { return this.isFormDirty; } + this.isLoaded = function() { + return this.isFormLoaded; + } + this.init = function() { Util.blockUI(); var localReference = this; @@ -153,6 +158,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod //Allow user input Util.unblockUI(); + localReference.isFormLoaded = true; }); } diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleHierarchy.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleHierarchy.js index 3371d56e506b0af43392b6c5290144fd8d751f83..642f9950c8202f5ede13259be1b19d0fff8f7c81 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleHierarchy.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleHierarchy.js @@ -287,7 +287,20 @@ function SampleHierarchy(serverFacade, inspector, containerId, profile, sample) mainController.changeView('showCreateSamplePage', sampleTypeCode); _this.serverFacade.searchWithUniqueId(permId, function(data) { var parentGroup = _this.profile.getGroupTypeCodeForTypeCode(data[0].sampleTypeCode); - mainController.currentView.sampleTypesLinksTables["sampleParents_" + parentGroup].addSample(data[0]); + + var setParent = function() { + mainController.currentView.sampleTypesLinksTables["sampleParents_" + parentGroup].addSample(data[0]); + } + + var repeatUntilSet = function() { + if(mainController.currentView.isLoaded()) { + setParent(); + } else { + setTimeout(repeatUntilSet, 100); + } + } + + repeatUntilSet(); }); }); }