Commit 825fd578e9d5aa6b5bd7774f06cf57016c69f828
Exists in
master
and in
111 other branches
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
js/app/views/FiltersUI.js
| @@ -628,7 +628,7 @@ Ext.define('amdaUI.FiltersUI', { | @@ -628,7 +628,7 @@ Ext.define('amdaUI.FiltersUI', { | ||
| 628 | var combo = this.getFilterCombo(); | 628 | var combo = this.getFilterCombo(); |
| 629 | if (!combo) | 629 | if (!combo) |
| 630 | return null; | 630 | return null; |
| 631 | - | 631 | + |
| 632 | var newRec = Ext.create('amdaModel.FilterDef'); | 632 | var newRec = Ext.create('amdaModel.FilterDef'); |
| 633 | 633 | ||
| 634 | if (name != null) | 634 | if (name != null) |
| @@ -712,6 +712,18 @@ Ext.define('amdaUI.FiltersUI', { | @@ -712,6 +712,18 @@ Ext.define('amdaUI.FiltersUI', { | ||
| 712 | 712 | ||
| 713 | onSaveFilter : function(t) | 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 | var rec = this.getCrtFilterRecord(); | 727 | var rec = this.getCrtFilterRecord(); |
| 716 | 728 | ||
| 717 | if (!rec) | 729 | if (!rec) |
| @@ -722,7 +734,6 @@ Ext.define('amdaUI.FiltersUI', { | @@ -722,7 +734,6 @@ Ext.define('amdaUI.FiltersUI', { | ||
| 722 | 734 | ||
| 723 | onApplyFilter : function(t) | 735 | onApplyFilter : function(t) |
| 724 | { | 736 | { |
| 725 | - | ||
| 726 | var me = this; | 737 | var me = this; |
| 727 | var rec = this.getCrtFilterRecord(); | 738 | var rec = this.getCrtFilterRecord(); |
| 728 | if (!rec) | 739 | if (!rec) |