CDPP / AMDA_IHM

Commit 096254362e30ece489fc21294a23c804cafe0c09

Authored by Elena.Budnik
1 parent d3ee926a
Exists in master and in 106 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, 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, special-params, sum-components-indexes, test-merge, ws_get_catalog

redmine 6852; mydata param; mask

Showing 1 changed file with 9 additions and 9 deletions   Show diff stats
Inline Side-by-side
js/app/views/MyDataUI.js
  Diff comments   View file @0962543
... ... @@ -396,15 +396,15 @@ Ext.define('amdaUI.MyDataUI', {
396 396 }
397 397  
398 398 if (maskParts.length == 2) {
399   - if (this.fileObject.get('fileName').indexOf(maskParts[1]) < 0) {
400   - myDesktopApp.warningMsg('No correspondance between ' +mask+' and '+this.fileObject.get('fileName'));
401   - return false;
402   - }
403   - }
404   -
405   - if ((maskParts[0].length + maskParts[1].length) < 6) {
406   - myDesktopApp.warningMsg('Mask cannot be shorter than 6 letters');
407   - return false;
  399 + if (this.fileObject.get('fileName').indexOf(maskParts[1]) < 0) {
  400 + myDesktopApp.warningMsg('No correspondance between ' +mask+' and '+this.fileObject.get('fileName'));
  401 + return false;
  402 + }
  403 +
  404 + if ((maskParts[0].length + maskParts[1].length) < 6) {
  405 + myDesktopApp.warningMsg('Mask cannot be shorter than 6 letters');
  406 + return false;
  407 + }
408 408 }
409 409  
410 410 return true;
... ...