SSDM-3026 : Show columns by default and show/hide tables to select samples properly.

SVN: 35984

plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js

@@ -128,6 +128,7 @@ function LinksView(linksController, linksModel) {
 			label : "Annot.::" + propertyType.label,
 			property : propertyAnnotationCode,
 			isExportable: true,
+			showByDefault: true,
 			sortable : true,
 			render : function(data) {
 				var sample = data["$object"];
@@ -199,7 +200,7 @@ function LinksView(linksController, linksModel) {
 	}
 	
 	linksView.showSamplePicker = function($container, sampleTypeCode) {
-		$container.empty();
+		$container.empty().show();
 		$container.css({
 			"margin" : "5px",
 			"padding" : "5px",
@@ -208,7 +209,7 @@ function LinksView(linksController, linksModel) {
 		
 		//Close Button
 		var $closeBtn = FormUtil.getButtonWithIcon("glyphicon-remove", function() {
-			$container.empty();
+			$container.empty().hide();
 		});
 		var $closeBtnContainer = $("<div>").append($closeBtn).css({"text-align" : "right", "padding-right" : "2px"});
 		$container.append($closeBtnContainer);
@@ -226,7 +227,7 @@ function LinksView(linksController, linksModel) {
 			
 			var rowClick = function(e) {
 				linksController.addSample(e.data["$object"]);
-				$container.empty();
+				$container.empty().hide();
 			}
 			
 			var dataGrid = SampleDataGridUtil.getSampleDataGrid(sampleTypeCode, samples, rowClick);

plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js

@@ -63,7 +63,9 @@ $.extend(Grid.prototype, {
 				.attr("value", column.property)
 				.attr("style", "margin-left: 5px;");
 			
-			if(thisGrid.columnsToShow && Object.keys(thisGrid.columnsToShow).length !== 0) {
+			if(column.showByDefault) {
+				checkbox.attr("checked", "checked");
+			} else if(thisGrid.columnsToShow && Object.keys(thisGrid.columnsToShow).length !== 0) {
 				if((thisGrid.columnsToShow[column.property] === true)) { //If settings are present
 					checkbox.attr("checked", "checked");
 				}