diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/util/FormUtil.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/util/FormUtil.js index 0846dfa2294fa033cc55805501052e4b730d4eab..afbebcaec8da827916b211b54ee1028ca7589441 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/util/FormUtil.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/util/FormUtil.js @@ -17,6 +17,19 @@ var FormUtil = new function() { // // Standard Form Fields // + + this.getDefaultBenchDropDown = function(id, isRequired) { + var $storageDropDown = this.getDefaultStoragesDropDown(id, isRequired); + for(var i = $storageDropDown.children().length -1; i >= 0 ; i--){ + var isEmpty = $storageDropDown.children()[i].value === ""; + var isBench = $storageDropDown.children()[i].value.startsWith("USER_BENCH"); + if(!isEmpty && !isBench){ + $storageDropDown.children()[i].remove(); + } + } + return $storageDropDown; + } + this.getDefaultStoragesDropDown = function(id, isRequired) { if(!this.profile.storagesConfiguration["isEnabled"]) { return null; 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 764a1c4dc08d5f208cbf3001a7095f0b29e485ce..9e3b824ac602197c48c054e495e39ab0732cb738 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 @@ -341,7 +341,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod } this.childrenAdded = function() { - var $childrenStorageDropdown = FormUtil.getDefaultStoragesDropDown('childrenStorageSelector', true); + var $childrenStorageDropdown = FormUtil.getDefaultBenchDropDown('childrenStorageSelector', true); if($childrenStorageDropdown && !$("#childrenStorageSelector").length) { var $childrenStorageDropdownWithLabel = FormUtil.getFieldForComponentWithLabel($childrenStorageDropdown, 'Storage'); $("#newChildrenOnBenchDropDown").append($childrenStorageDropdownWithLabel);