CDPP / AMDA_IHM

Commit 825fd578e9d5aa6b5bd7774f06cf57016c69f828

Authored by Myriam Bouchemit
2 parents f3fc3730 be6cbe5d
Exists in master and in 110 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, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, 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

Merge branch 'avoid_filter_name_duplication' into 'master' 

Avoid filter name duplication

fix #5283: check for filter name duplication

See merge request !8
Showing 1 changed file with 13 additions and 2 deletions   Show diff stats
Inline Side-by-side
js/app/views/FiltersUI.js
  Diff comments   View file @825fd57
... ... @@ -628,7 +628,7 @@ Ext.define('amdaUI.FiltersUI', {
628 628 var combo = this.getFilterCombo();
629 629 if (!combo)
630 630 return null;
631   -
  631 +
632 632 var newRec = Ext.create('amdaModel.FilterDef');
633 633  
634 634 if (name != null)
... ... @@ -712,6 +712,18 @@ Ext.define('amdaUI.FiltersUI', {
712 712  
713 713 onSaveFilter : function(t)
714 714 {
  715 + var filters = this.getFilterCombo().getStore().data.items;
  716 + for (key in filters) {
  717 + if (filters[key].get('name') === this.getFilterName()) {
  718 + Ext.Msg.show({
  719 + title:'Duplicated name',
  720 + msg: 'This name is already used.<br/>Please choose an other one or remove the old filter.',
  721 + icon: Ext.Msg.WARNING
  722 + });
  723 + return null;
  724 + }
  725 + }
  726 +
715 727 var rec = this.getCrtFilterRecord();
716 728  
717 729 if (!rec)
... ... @@ -722,7 +734,6 @@ Ext.define(&#39;amdaUI.FiltersUI&#39;, {
722 734  
723 735 onApplyFilter : function(t)
724 736 {
725   -
726 737 var me = this;
727 738 var rec = this.getCrtFilterRecord();
728 739 if (!rec)
... ...