From 0e4c0be047c4c7811c15e4e8577f8fb6dd7bdcf3 Mon Sep 17 00:00:00 2001
From: Juan Fuentes <juanf@bs-mbpr28.d.ethz.ch>
Date: Mon, 20 May 2019 10:33:46 +0200
Subject: [PATCH] SSDM-8232 : Freeze button on the toolbar can now be disabled
---
.../eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js | 4 ++--
.../eln-lims/html/js/views/DataSetForm/DataSetFormView.js | 4 +++-
.../eln-lims/html/js/views/SampleForm/SampleFormView.js | 4 +++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
index b4458f4b412..6b335612f2c 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
@@ -309,7 +309,7 @@ $.extend(DefaultProfile.prototype, {
this.searchSamplesUsingV3OnDropboxRunCustom = false;
this.getDataSetTypeToolbarConfiguration = function(dataSetTypeCode) {
- var defaultToolbar = { EDIT : true, MOVE : true, ARCHIVE : true, DELETE : true, HIERARCHY_TABLE : true, EXPORT_ALL : true, EXPORT_METADATA : true };
+ var defaultToolbar = { EDIT : true, FREEZE : true, MOVE : true, ARCHIVE : true, DELETE : true, HIERARCHY_TABLE : true, EXPORT_ALL : true, EXPORT_METADATA : true };
if(this.dataSetTypeDefinitionsExtension[dataSetTypeCode] && this.dataSetTypeDefinitionsExtension[dataSetTypeCode]["TOOLBAR"]) {
var toolbarOptions = this.dataSetTypeDefinitionsExtension[dataSetTypeCode]["TOOLBAR"];
for(key in toolbarOptions) {
@@ -320,7 +320,7 @@ $.extend(DefaultProfile.prototype, {
}
this.getSampleTypeToolbarConfiguration = function(sampleTypeCode) {
- var defaultToolbar = { CREATE : true, EDIT : true, MOVE : true, COPY: true, DELETE : true, PRINT: true, HIERARCHY_GRAPH : true, HIERARCHY_TABLE : true, UPLOAD_DATASET : true, UPLOAD_DATASET_HELPER : true, EXPORT_ALL : true, EXPORT_METADATA : true };
+ var defaultToolbar = { CREATE : true, EDIT : true, FREEZE : true, MOVE : true, COPY: true, DELETE : true, PRINT: true, HIERARCHY_GRAPH : true, HIERARCHY_TABLE : true, UPLOAD_DATASET : true, UPLOAD_DATASET_HELPER : true, EXPORT_ALL : true, EXPORT_METADATA : true };
if(this.sampleTypeDefinitionsExtension[sampleTypeCode] && this.sampleTypeDefinitionsExtension[sampleTypeCode]["TOOLBAR"]) {
var toolbarOptions = this.sampleTypeDefinitionsExtension[sampleTypeCode]["TOOLBAR"];
for(key in toolbarOptions) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
index cfcf2ba914b..4c7e7dec799 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
@@ -92,7 +92,9 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
var isEntityFrozen = _this._dataSetFormModel.v3_dataset.frozen;
var isEntityFrozenTooltip = (isEntityFrozen)?"Entity Frozen":"Freeze Entity (Disable further modifications)";
var $freezeButton = FormUtil.getFreezeButton("DATASET", this._dataSetFormModel.v3_dataset.permId.permId, isEntityFrozen);
- toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ if(toolbarConfig.FREEZE) {
+ toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ }
}
if(!_this._dataSetFormModel.v3_dataset.frozen) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index 76112a3b4f6..812b8d51f7e 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -150,7 +150,9 @@ function SampleFormView(sampleFormController, sampleFormModel) {
var isEntityFrozen = _this._sampleFormModel.v3_sample.frozen;
var isEntityFrozenTooltip = (isEntityFrozen)?"Entity Frozen":"Freeze Entity (Disable further modifications)";
var $freezeButton = FormUtil.getFreezeButton("SAMPLE", this._sampleFormModel.v3_sample.permId.permId, isEntityFrozen);
- toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ if(toolbarConfig.FREEZE) {
+ toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ }
}
if(!_this._sampleFormModel.v3_sample.frozen) {
--
GitLab