Merge branch 'master' of sissource.ethz.ch:sis/openbis

microservice-server/.gitignore

+/build/
+/bin/

openbis_all/.classpath

@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="source/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/>
 	<classpathentry kind="output" path="targets/classes"/>
 </classpath>

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js

@@ -23,6 +23,7 @@ var LayoutManager = {
 	thirdColumn : null,
 	isResizingColumn : false,
 	isLoadingView : false,
+	isBlocked : false,
 	_init : function(isFirstTime) {
 		var _this = this;
 		
@@ -338,7 +339,7 @@ var LayoutManager = {
 		}
 	},
 	canReload : function() {
-		return this.isResizingColumn === false && this.isLoadingView === false;
+		return this.isBlocked == false && this.isResizingColumn === false && this.isLoadingView === false && this.firstColumn.width() > 0;
 	},
 	reloadView : function(view, forceFirstTime) {
 		var _this = this;
@@ -373,6 +374,7 @@ var LayoutManager = {
 		this.secondColumnContentResize();
 	},
 	resize : function(view, forceFirstTime) {
+		console.log("resize");
 		if(this.canReload()) {
 			this.reloadView(view, forceFirstTime);
 		}

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js

@@ -258,6 +258,7 @@ function MainController(profile) {
 		this._changeView(newViewChange, arg, true, shouldStateBePushToHistory);
 	}
 	this._changeView = function(newViewChange, arg, shouldURLBePushToHistory, shouldStateBePushToHistory) {
+		LayoutManager.isBlocked = false;
 		//
 		// Dirty forms management, to avoid loosing changes.
 		//
@@ -463,6 +464,7 @@ function MainController(profile) {
 					});
 					break;
 				case "showEditExperimentPageFromIdentifier":
+					LayoutManager.isBlocked = true; // CKEDITOR owns hooks and variables that will break if the layout manager does its magic
 					var _this = this;
 					this.serverFacade.listExperimentsForIdentifiers([arg], function(data) {
 						document.title = "" + ELNDictionary.getExperimentKindName(arg) + " " + arg;
@@ -495,6 +497,7 @@ function MainController(profile) {
 					//window.scrollTo(0,0);
 					break;
 				case "showEditSamplePageFromPermId":
+					LayoutManager.isBlocked = true; // CKEDITOR owns hooks and variables that will break if the layout manager does its magic
 					var _this = this;
 					var permId = null;
 					var paginationInfo = null;
@@ -614,6 +617,7 @@ function MainController(profile) {
 					});
 					break;
 				case "showEditDataSetPageFromPermId":
+					LayoutManager.isBlocked = true; // CKEDITOR owns hooks and variables that will break if the layout manager does its magic
 					var _this = this;
 					var dsCriteria = { 	
 							entityKind : "DATASET", 

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js

@@ -142,11 +142,24 @@ function StorageListView(storageListController, storageListModel) {
 				_this.showStorageWidget(data.data['$object'])
 			}
 		}
-		
-		this._dataGrid = new DataGridController(null, columns, [], null, getDataList, rowClick, false, "STORAGE_WIDGET");
-		
+
+		// multi-select delete option
+		let isMultiselectable = false;
+		var extraOptions = [];
+		if(!this._storageListModel.isDisabled) {
+			isMultiselectable = true;
+			extraOptions.push({ name : "Delete selected", action : function(selected) {
+				for (let i=0; i<selected.length; i++) {
+					_this.removeChildFromSampleOrMarkToDelete(selected[i]);
+				}
+				_this._dataGrid.refresh();
+			}});
+		}
+
+		this._dataGrid = new DataGridController(null, columns, [], null, getDataList, rowClick, false, "STORAGE_WIDGET", isMultiselectable);
+
 		var $dataGridContainer = $("<div>");
-		this._dataGrid.init($dataGridContainer);
+		this._dataGrid.init($dataGridContainer, extraOptions);
 		$container.append($dataGridContainer);
 		
 		var $storageAddButton = $("<a>", { class : 'btn btn-default', style : "float: right; background-color:#f9f9f9;" }).append($("<i>", { class : "glyphicon glyphicon-plus" } ));
@@ -280,4 +293,4 @@ function StorageListView(storageListController, storageListModel) {
 		}
 	}
 	
-}
+}
\ No newline at end of file