CDPP / AMDA_IHM

Commit 880ea119a4038c7637bc308eae50a58d95329373

Authored by Elena.Budnik
1 parent 94a05aa2
Exists in master and in 112 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

check object

Showing 1 changed file with 7 additions and 2 deletions   Show diff stats
Inline Side-by-side
js/app/views/StatisticsUI.js
  Diff comments   View file @880ea11
@@ -66,6 +66,11 @@ Ext.define('amdaUI.StatisticsUI', { @@ -66,6 +66,11 @@ Ext.define('amdaUI.StatisticsUI', {
66 var obj = new Object(); 66 var obj = new Object();
67 obj.param = rec.get('name'); 67 obj.param = rec.get('name');
68 obj.function = rec.get('function'); 68 obj.function = rec.get('function');
  69 + if (obj.function == null) {
  70 + myDesktopApp.warningMsg('Please select function : `click to select`');
  71 + updateStatus = false;
  72 + return;
  73 + }
69 paramArr.push(obj); 74 paramArr.push(obj);
70 }); 75 });
71 76
@@ -300,10 +305,10 @@ Ext.define('amdaUI.StatisticsUI', { @@ -300,10 +305,10 @@ Ext.define('amdaUI.StatisticsUI', {
300 handler: function(){ 305 handler: function(){
301 // update object with user's values 306 // update object with user's values
302 // if the return is true (object had been updated) 307 // if the return is true (object had been updated)
303 - // if(this.updateObject()){ 308 + if(this.updateObject()){
304 this.updateObject(); 309 this.updateObject();
305 this.generateCatalog(); 310 this.generateCatalog();
306 - // } 311 + }
307 } 312 }
308 }, 313 },
309 { 314 {