From 5bd68d5199566abaaf2f3af97b4cc07403d3ed3c Mon Sep 17 00:00:00 2001
From: Juan Fuentes <juanf@bs-mbpr28.d.ethz.ch>
Date: Tue, 28 May 2019 11:15:46 +0200
Subject: [PATCH] SSDM-7424 : Freeze button moved to the end of the toolbar
---
.../js/views/DataSetForm/DataSetFormView.js | 20 +++++++++----------
.../ExperimentForm/ExperimentFormView.js | 17 ++++++++--------
.../js/views/ProjectForm/ProjectFormView.js | 16 +++++++--------
.../js/views/SampleForm/SampleFormView.js | 20 +++++++++----------
.../html/js/views/SpaceForm/SpaceFormView.js | 16 +++++++--------
5 files changed, 44 insertions(+), 45 deletions(-)
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 16305c02188..3ee378144f0 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
@@ -86,16 +86,6 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
var toolbarModel = [];
if(this._dataSetFormModel.mode === FormMode.VIEW && !this._dataSetFormModel.isMini) {
var toolbarConfig = profile.getDataSetTypeToolbarConfiguration(_this._dataSetFormModel.dataSet.dataSetTypeCode);
-
- //Freeze
- if(_this._dataSetFormModel.v3_dataset && _this._dataSetFormModel.v3_dataset.frozen !== undefined) { //Freezing available on the API
- 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);
- if(toolbarConfig.FREEZE) {
- toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
- }
- }
if(!_this._dataSetFormModel.v3_dataset.frozen) {
//Edit Button
@@ -206,6 +196,16 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
});
toolbarModel.push({ component : $jupyterBtn, tooltip: "Create Jupyter notebook" });
}
+
+ //Freeze
+ if(_this._dataSetFormModel.v3_dataset && _this._dataSetFormModel.v3_dataset.frozen !== undefined) { //Freezing available on the API
+ 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);
+ if(toolbarConfig.FREEZE) {
+ toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ }
+ }
} else if(!this._dataSetFormModel.isMini) {
var $saveBtn = FormUtil.getButtonWithIcon("glyphicon-floppy-disk", function() {
_this._dataSetFormController.submitDataSet();
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
index 846ea852074..ce55d1c6636 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
@@ -104,14 +104,6 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
toolbarModel.push({ component : $createBtn, tooltip: "Create " + Util.getDisplayNameFromCode(mandatorySampleTypeCode) });
}
- //Freeze
- if(_this._experimentFormModel.v3_experiment && _this._experimentFormModel.v3_experiment.frozen !== undefined) { //Freezing available on the API
- var isEntityFrozen = _this._experimentFormModel.v3_experiment.frozen;
- var isEntityFrozenTooltip = (isEntityFrozen)?"Entity Frozen":"Freeze Entity (Disable further modifications)";
- var $freezeButton = FormUtil.getFreezeButton("EXPERIMENT", this._experimentFormModel.v3_experiment.permId.permId, isEntityFrozen);
- toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
- }
-
if(!_this._experimentFormModel.v3_experiment.frozen) {
//Edit
var $editBtn = FormUtil.getButtonWithIcon("glyphicon-edit", function () {
@@ -168,7 +160,14 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
});
toolbarModel.push({ component : $jupyterBtn, tooltip: "Create Jupyter notebook" });
}
-
+
+ //Freeze
+ if(_this._experimentFormModel.v3_experiment && _this._experimentFormModel.v3_experiment.frozen !== undefined) { //Freezing available on the API
+ var isEntityFrozen = _this._experimentFormModel.v3_experiment.frozen;
+ var isEntityFrozenTooltip = (isEntityFrozen)?"Entity Frozen":"Freeze Entity (Disable further modifications)";
+ var $freezeButton = FormUtil.getFreezeButton("EXPERIMENT", this._experimentFormModel.v3_experiment.permId.permId, isEntityFrozen);
+ toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ }
} else { //Create and Edit
var $saveBtn = FormUtil.getButtonWithIcon("glyphicon-floppy-disk", function() {
_this._experimentFormController.updateExperiment();
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 b1b5bff5ae5..7b1d34b73ec 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
@@ -93,14 +93,6 @@ function ProjectFormView(projectFormController, projectFormModel) {
toolbarModel.push({ component : $createExpBtn, tooltip: "Create " + ELNDictionary.getExperimentKindName(projectIdentifier) });
}
- //Freeze
- if(_this._projectFormModel.v3_project && _this._projectFormModel.v3_project.frozen !== undefined) { //Freezing available on the API
- var isEntityFrozen = _this._projectFormModel.v3_project.frozen;
- var isEntityFrozenTooltip = (isEntityFrozen)?"Entity Frozen":"Freeze Entity (Disable further modifications)";
- var $freezeButton = FormUtil.getFreezeButton("PROJECT", this._projectFormModel.v3_project.permId.permId, isEntityFrozen);
- toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
- }
-
if(!_this._projectFormModel.v3_project.frozen) {
//Edit
var $editBtn = FormUtil.getButtonWithIcon("glyphicon-edit", function () {
@@ -141,6 +133,14 @@ function ProjectFormView(projectFormController, projectFormModel) {
toolbarModel.push({ component : $share, tooltip: "Manage access" });
}
+ //Freeze
+ if(_this._projectFormModel.v3_project && _this._projectFormModel.v3_project.frozen !== undefined) { //Freezing available on the API
+ var isEntityFrozen = _this._projectFormModel.v3_project.frozen;
+ var isEntityFrozenTooltip = (isEntityFrozen)?"Entity Frozen":"Freeze Entity (Disable further modifications)";
+ var $freezeButton = FormUtil.getFreezeButton("PROJECT", this._projectFormModel.v3_project.permId.permId, isEntityFrozen);
+ toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ }
+
//Operations
var $operationsMenu = FormUtil.getOperationsMenu([{ label: "Create " + ELNDictionary.getExperimentKindName(projectIdentifier), event: function() {
showSelectExperimentType();
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 082438524b9..e61ba3d47bc 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
@@ -145,16 +145,6 @@ function SampleFormView(sampleFormController, sampleFormModel) {
}
}
- //Freeze
- if(_this._sampleFormModel.v3_sample && _this._sampleFormModel.v3_sample.frozen !== undefined) { //Freezing available on the API
- 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);
- if(toolbarConfig.FREEZE) {
- toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
- }
- }
-
if(!_this._sampleFormModel.v3_sample.frozen) {
//Edit
if(this._sampleFormModel.mode === FormMode.VIEW) {
@@ -309,6 +299,16 @@ function SampleFormView(sampleFormController, sampleFormModel) {
});
toolbarModel.push({ component : $jupyterBtn, tooltip: "Create Jupyter notebook" });
}
+
+ //Freeze
+ if(_this._sampleFormModel.v3_sample && _this._sampleFormModel.v3_sample.frozen !== undefined) { //Freezing available on the API
+ 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);
+ if(toolbarConfig.FREEZE) {
+ toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ }
+ }
} else { //Create and Edit
var $saveBtn = FormUtil.getButtonWithIcon("glyphicon-floppy-disk", function() {
_this._sampleFormController.createUpdateCopySample();
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormView.js
index d7bc346169f..0cee72d0cb6 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormView.js
@@ -40,14 +40,6 @@ function SpaceFormView(spaceFormController, spaceFormModel) {
});
toolbarModel.push({ component : $createProj, tooltip: "Create Project" });
- //Freeze
- if(_this._spaceFormModel.v3_space && _this._spaceFormModel.v3_space.frozen !== undefined) { //Freezing available on the API
- var isEntityFrozen = _this._spaceFormModel.v3_space.frozen;
- var isEntityFrozenTooltip = (isEntityFrozen)?"Entity Frozen":"Freeze Entity (Disable further modifications)";
- var $freezeButton = FormUtil.getFreezeButton("SPACE", _this._spaceFormModel.v3_space.permId.permId, isEntityFrozen);
- toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
- }
-
//Export
var $exportAll = FormUtil.getExportButton([{ type: "SPACE", permId : _this._spaceFormModel.space.code, expand : true }], false);
toolbarModel.push({ component : $exportAll, tooltip: "Export Metadata & Data" });
@@ -74,6 +66,14 @@ function SpaceFormView(spaceFormController, spaceFormModel) {
toolbarModel.push({ component : $share, tooltip: "Manage access" });
}
+ //Freeze
+ if(_this._spaceFormModel.v3_space && _this._spaceFormModel.v3_space.frozen !== undefined) { //Freezing available on the API
+ var isEntityFrozen = _this._spaceFormModel.v3_space.frozen;
+ var isEntityFrozenTooltip = (isEntityFrozen)?"Entity Frozen":"Freeze Entity (Disable further modifications)";
+ var $freezeButton = FormUtil.getFreezeButton("SPACE", _this._spaceFormModel.v3_space.permId.permId, isEntityFrozen);
+ toolbarModel.push({ component : $freezeButton, tooltip: isEntityFrozenTooltip });
+ }
+
var $header = views.header;
$header.append($formTitle);
$header.append(FormUtil.getToolbar(toolbarModel));
--
GitLab