From da1d6ce8327485f096f2f86f2d873d6a1e36bfe6 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 25 Aug 2017 10:14:14 +0000
Subject: [PATCH] SSDM-4223 : project dto bugfix + remove debugger lines
SVN: 38668
---
.../1/as/webapps/eln-lims/html/js/config/SettingsManager.js | 1 -
.../eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js | 1 -
.../eln-lims/html/js/views/ProjectForm/ProjectFormView.js | 3 +--
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js
index e81487b0f57..356a9090699 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/SettingsManager.js
@@ -148,7 +148,6 @@ function SettingsManager(serverFacade) {
if (hint.ANNOTATION_PROPERTIES) {
var propertyTypeOptions = this.getAnnotationPropertyTypeOptions();
for (var annotationProperty of hint.ANNOTATION_PROPERTIES) {
- // debugger;
if (sampleTypeExists && (annotationProperty.TYPE == null || propertyTypeOptions.indexOf(annotationProperty.TYPE) === -1)) {
errors.push(errorPrefix + "Annotation properties must have an existing property type but is: " +
annotationProperty.TYPE);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js
index 1469a5e620b..f96091986bb 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/TreeUtil.js
@@ -23,7 +23,6 @@ var TreeUtil = new function() {
this.getTreeForEntity = function($treeContainer, entity) {
var treeModel;
- debugger;
switch(entity["@type"]) {
case "SpaceWithProjectsAndRoleAssignments":
treeModel = { title : Util.getDisplayNameForEntity(entity), entityType: "SPACE", key : entity.code, folder : true, lazy : true, hideCheckbox: true };
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
index 4c0f62ce684..2e7d08dbdd8 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
@@ -178,10 +178,9 @@ function ProjectFormView(projectFormController, projectFormModel) {
$formColumn.append($("<legend>").append(ELNDictionary.getExperimentKindName("/" + _this._projectFormModel.project.spaceCode, true)))
$formColumn.append($experimentsContainer);
- var experimentTableController = new ExperimentTableController(this._projectFormController, null, this._projectFormModel.project, true);
+ var experimentTableController = new ExperimentTableController(this._projectFormController, null, jQuery.extend(true, {}, this._projectFormModel.project), true);
experimentTableController.init($experimentsContainer);
-
$formColumn.append($("<legend>").append("" + ELNDictionary.Samples + ""))
var $samplesContainerHeader = $("<div>");
$formColumn.append($samplesContainerHeader);
--
GitLab