From 1187b351d23dd624ce76fcff892d4c2d2f3c1857 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 5 Oct 2015 11:45:14 +0000
Subject: [PATCH] SSDM-2435 : More Polishing
SVN: 34781
---
.../html/js/DataSetFormController.js | 18 +-----------------
.../html/js/DataSetFormModel.js | 12 +++++++++---
.../html/js/DataSetFormView.js | 15 ++-------------
3 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js
index a2833be7517..f156911ca49 100644
--- a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js
+++ b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js
@@ -38,28 +38,12 @@ function DataSetFormController() {
});
}
- this._getDataSetType = function(typeCode) {
- for(var i = 0; i < this._dataSetFormModel.dataSetTypes.length; i++) {
- if(this._dataSetFormModel.dataSetTypes[i].code === typeCode) {
- return this._dataSetFormModel.dataSetTypes[i];
- }
- }
- return null;
- }
-
//
// Form Submit
//
- this.submitDataSet = function() {
- //
- // Check upload is finish
- //
+ this.submit = function() {
Util.blockUI();
var _this = this;
-
- //
- // Metadata Submit and Creation (Step 2)
- //
var metadata = this._dataSetFormModel.dataSet.properties;
var isZipDirectoryUpload = $("#isZipDirectoryUpload"+":checked").val() === "on";
diff --git a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormModel.js b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormModel.js
index 3a63233a3df..7581049b25c 100644
--- a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormModel.js
+++ b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormModel.js
@@ -15,12 +15,18 @@
*/
function DataSetFormModel(sampleOrExperiment) {
- this.isFormDirty = false;
-
this.sampleOrExperiment = sampleOrExperiment;
this.dataSet = { properties : {} };
-
this.dataStores = [];
this.dataSetTypes = null;
this.files = [];
+
+ this.getDataSetType = function(typeCode) {
+ for(var i = 0; i < this.dataSetTypes.length; i++) {
+ if(this.dataSetTypes[i].code === typeCode) {
+ return this.dataSetTypes[i];
+ }
+ }
+ return null;
+ }
}
diff --git a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
index 2c0223b9fb4..b05fd966d7e 100644
--- a/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
+++ b/openbis/source/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js
@@ -26,7 +26,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
var $wrapper = $('<form>', { class : 'form-horizontal ', 'id' : 'mainDataSetForm', 'role' : 'form'});
$wrapper.submit(function(event) {
event.preventDefault();
- _this._dataSetFormController.submitDataSet();
+ _this._dataSetFormController.submit();
});
//
@@ -55,9 +55,8 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
var $dataSetTypeSelector = FormUtil.getDataSetsDropDown('DATASET_TYPE', this._dataSetFormModel.dataSetTypes);
$dataSetTypeSelector.change(function() {
_this._repaintMetadata(
- _this._dataSetFormController._getDataSetType($('#DATASET_TYPE').val())
+ _this._dataSetFormModel.getDataSetType($('#DATASET_TYPE').val())
);
- _this.isFormDirty = true;
});
var $dataSetTypeDropDown = $('<div>', { class : 'form-group'});
@@ -134,10 +133,6 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
if(this._dataSetFormModel.files.length > 1) {
var $textField = FormUtil._getInputField('text', 'folderName', 'Folder Name', null, true);
- $textField.change(function(event) {
- _this.isFormDirty = true;
- });
-
var $folderName = $('<div>')
.append($('<div>', { class : "form-group"})
.append($('<label>', {class : 'control-label '+ FormUtil.labelColumnClass}).html('Folder Name (*):'))
@@ -163,13 +158,8 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
$wrapper.append($fileFieldSetIsDirectory);
$("#isZipDirectoryUpload").change(function() {
- _this.isFormDirty = true;
if($("#isZipDirectoryUpload"+":checked").val() === "on") {
var $textField = FormUtil._getInputField('text', 'folderName', 'Folder Name', null, true);
- $textField.change(function(event) {
- _this.isFormDirty = true;
- });
-
var $folderName = $('<div>', { "id" : "folderNameContainer"})
.append($('<div>', { class : "form-group"})
.append($('<label>', {class : 'control-label '+ FormUtil.labelColumnClass}).html('Folder Name (*):'))
@@ -217,7 +207,6 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
} else {
propertyTypeCode = propertyType.code;
}
- _this._dataSetFormModel.isFormDirty = true;
var field = $(this);
if(propertyType.dataType === "BOOLEAN") {
_this._dataSetFormModel.dataSet.properties[propertyTypeCode] = field.children()[0].checked;
--
GitLab