SP-909 / BIS-524 : ELN UI - Bug Fixes.

SVN: 29853

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/Profile.js

@@ -244,7 +244,9 @@ $.extend(DefaultProfile.prototype, {
 						groupOfMenuItems.menuItems.push(menuItem);
 					}
 				}
-				this.menuStructure.push(groupOfMenuItems);
+				if(groupOfMenuItems.menuItems.length > 0) {
+					this.menuStructure.push(groupOfMenuItems);
+				}
 			}
 		}
 		//

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js

@@ -57,6 +57,7 @@ function SampleTable(mainController, sampleTableId, profile, sampleTypeCode,insp
 		var localReference = this;
 		$("#fileToRegister").unbind('change');
 		$("#fileToRegister").change(function() {
+			Util.blockUI();
 			Util.fileUpload("fileToRegister", function(result) {
 				//Code After the upload
 				localReference.mainController.openbisServer.uploadedSamplesInfo(localReference.sampleTypeCode, "sample-file-upload", 
@@ -111,9 +112,9 @@ function SampleTable(mainController, sampleTableId, profile, sampleTypeCode,insp
 	
 	this.updateSamples = function() {
 		var localReference = this;
-		Util.blockUI();
 		$("#fileToUpdate").unbind('change');
 		$("#fileToUpdate").change(function() {
+			Util.blockUI();
 			var finalCallback = function(data) {
 				if(data.error) {
 					Util.showError(data.error.message, function() {Util.unblockUI();});