From 26d6ef6c76111ee3ab31371f0800c59382d1bf4e Mon Sep 17 00:00:00 2001
From: yvesn <yvesn>
Date: Thu, 1 Jun 2017 15:31:37 +0000
Subject: [PATCH] SSDM-5068 : ELN config on GUI - using display names instead
of codes on UI
SVN: 38248
---
.../html/js/views/SettingsForm/SettingsFormView.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
index 31c4970fd98..784bcdd5ee3 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js
@@ -220,7 +220,7 @@ function SettingsFormView(settingsFormController, settingsFormModel) {
var allDatasetTypeCodes = this._settingsFormController.getAllDatasetTypeCodeOptions();
return FormUtil.getDropdown(allDatasetTypeCodes.map(function(option) {
return {
- label : option,
+ label : Util.getDisplayNameFromCode(option),
value : option,
selected : option === rowData.dataSetType,
};
@@ -251,7 +251,8 @@ function SettingsFormView(settingsFormController, settingsFormModel) {
for (var sampleType of this._profileToEdit.getAllSampleTypes()) {
// layout
var $div = $("<div>").css("padding-left", "15px");
- var $sampleTypeFieldset = this._getFieldset($div, sampleType.code, "settings-section-sampletype-" + sampleType.code, true);
+ var displayName = Util.getDisplayNameFromCode(sampleType.code);
+ var $sampleTypeFieldset = this._getFieldset($div, displayName, "settings-section-sampletype-" + sampleType.code, true);
$fieldset.append($div);
// table for sample type
var sampleTypeSettings = this._profileToEdit.sampleTypeDefinitionsExtension[sampleType.code];
@@ -290,7 +291,7 @@ function SettingsFormView(settingsFormController, settingsFormModel) {
var options = this._settingsFormController.getSampleTypeOptions();
return FormUtil.getDropdown(options.map(function(option) {
return {
- label : option,
+ label : Util.getDisplayNameFromCode(option),
value : option,
selected : option === rowData.TYPE,
};
@@ -358,7 +359,7 @@ function SettingsFormView(settingsFormController, settingsFormModel) {
var options = this._settingsFormController.getAnnotationPropertyTypeOptions();
return FormUtil.getDropdown(options.map(function(option) {
return {
- label : option,
+ label : Util.getDisplayNameFromCode(option),
value : option,
selected : option === rowData.TYPE,
};
--
GitLab