Browse Source

AMBARI-5023. Mirroring: Create New Dataset popup tweaks. (akovalenko)

Aleksandr Kovalenko 11 năm trước cách đây
mục cha
commit
97cff09d2c

+ 5 - 1
ambari-web/app/controllers/main/mirroring/edit_dataset_controller.js

@@ -24,7 +24,6 @@ App.MainMirroringEditDataSetController = Ember.Controller.extend({
   // Fields values from Edit DataSet form
   formFields: Ember.Object.create({
     datasetName: null,
-    datasetType: null,
     datasetTargetClusterName: null,
     datasetSourceDir: null,
     datasetTargetDir: null,
@@ -184,6 +183,11 @@ App.MainMirroringEditDataSetController = Ember.Controller.extend({
       errors.set('isEndDateError', true);
       errorMessages.set('endDate', Em.I18n.t('mirroring.dateOrder.error'));
     }
+    // Check that startDate is after current date
+    if (!this.get('isEdit') && new Date(App.dateTime()) > scheduleStartDate) {
+      errors.set('isStartDateError', true);
+      errorMessages.set('startDate', Em.I18n.t('mirroring.startDate.error'));
+    }
     // Check that repeat field value consists only from digits
     if (isNaN(this.get('formFields.datasetFrequency'))) {
       errors.set('isFrequencyError', true);

+ 1 - 1
ambari-web/app/messages.js

@@ -1838,7 +1838,6 @@ Em.I18n.translations = {
   'mirroring.dataset.schedule.repeatEvery':'Repeat every ',
   'mirroring.dataset.addTargetCluster':'Add Target Cluster',
   'mirroring.dataset.type.HDFS':'HDFS',
-  'mirroring.dataset.type.Hive':'Hive Tables',
   'mirroring.dataset.repeat.minutes':'minutes',
   'mirroring.dataset.repeat.hours':'hours',
   'mirroring.dataset.repeat.days':'days',
@@ -1869,6 +1868,7 @@ Em.I18n.translations = {
 
   'mirroring.required.error': 'This field is required',
   'mirroring.dateOrder.error': 'End Date must be after Start Date',
+  'mirroring.startDate.error': 'Start Date in the past is not allowed',
   'mirroring.required.invalidNumberError' : 'Enter valid number',
 
   'rollingrestart.dialog.title': 'Restart {0}s',

+ 2 - 3
ambari-web/app/templates/main/mirroring/edit_dataset.hbs

@@ -32,13 +32,12 @@
           <td class="spacer" colspan="3"></td>
         </tr>
 
-        <tr {{bindAttr class="errors.isTypeError:error"}}>
+        <tr>
           <td class="percent25" colspan="1">
             {{t mirroring.dataset.type}}
           </td>
           <td colspan="2" style="text-align: left">
-            {{view Ember.Select selectionBinding="formFields.datasetType" contentBinding="view.datasetTypeOptions"}}
-            <span class="help-inline">{{errorMessages.type}}</span>
+            {{t mirroring.dataset.type.HDFS}}
           </td>
         </tr>
         <tr>

+ 8 - 3
ambari-web/app/views/main/mirroring/edit_dataset_view.js

@@ -27,8 +27,6 @@ App.MainMirroringEditDataSetView = Em.View.extend({
 
   hasTargetClusters: false,
 
-  datasetTypeOptions: [Em.I18n.t('mirroring.dataset.type.HDFS'), Em.I18n.t('mirroring.dataset.type.Hive')],
-
   targetClusters: App.TargetCluster.find(),
 
   targetClusterSelect: Em.Select.extend({
@@ -105,9 +103,16 @@ App.MainMirroringEditDataSetView = Em.View.extend({
   }),
 
   didInsertElement: function () {
+    // Initialize datepicker
     $('.datepicker').datepicker({
       format: 'mm/dd/yyyy'
-    });
+    }).on('changeDate', function (ev) {
+          $(this).datepicker('hide');
+        });
+
+    // Set default value for Repeat every combo box
+    this.set('controller.formFields.repeatOptionSelected', this.get('repeatOptions')[2]);
+
     this.fillForm();
     this.onTargetClustersChange();
   },