CDPP / AMDA_IHM

Commit ab41a22b8b2e2a3d38718f4c35e363aad2e34e1f

Authored by Elena.Budnik
1 parent 09625436
Exists in master and in 107 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, 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

no sorting at parameters level

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
Inline Side-by-side
js/app/views/ExplorerUI.js
  Diff comments   View file @ab41a22
@@ -214,7 +214,7 @@ Ext.define('amdaUI.ExplorerUI', { @@ -214,7 +214,7 @@ Ext.define('amdaUI.ExplorerUI', {
214 var tree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID); 214 var tree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
215 tree.getStore().sort([ 215 tree.getStore().sort([
216 { sorterFn: function(o1, o2){ 216 { sorterFn: function(o1, o2){
217 - if (o1.get('nodeType') !== 'localParam') 217 + if (o1.get('nodeType') !== 'localParam' || o1.get('isParameter'))
218 return; 218 return;
219 219
220 return o1.get('text').toUpperCase() < o2.get('text').toUpperCase() ? -1 : 1; 220 return o1.get('text').toUpperCase() < o2.get('text').toUpperCase() ? -1 : 1;
@@ -267,7 +267,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, { @@ -267,7 +267,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
267 sorters:[{ direction: 'ASC' , 267 sorters:[{ direction: 'ASC' ,
268 sorterFn: function(o1, o2){ 268 sorterFn: function(o1, o2){
269 269
270 - if (o1.get('nodeType') == 'localParam' || o1.get('nodeType') == 'myData') { 270 + if ((o1.get('nodeType') == 'localParam' && !o1.get('isParameter')) || o1.get('nodeType') == 'myData') {
271 return o1.get('text').toUpperCase() < o2.get('text').toUpperCase() ? -1 : 1; 271 return o1.get('text').toUpperCase() < o2.get('text').toUpperCase() ? -1 : 1;
272 } 272 }
273 273