CDPP / AMDA_IHM

Commit cd0eae14a939932d51b156dbde9ca2d1c3cca6bb

Authored by Elena.Budnik
1 parent d0cb1f34
Exists in master and in 93 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, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, frames-transformation, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

rm 8464 corr

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
Inline Side-by-side
js/app/models/AmdaNode.js
  Diff comments   View file @cd0eae1
... ... @@ -127,10 +127,10 @@ Ext.define('amdaModel.AmdaNode', {
127 127 itemKind = amdaUI.ExplorerUI.ITEM_KIND_ROOT;
128 128 }
129 129 // if this node is a leaf and have no child
130   - else if (this.isLeaf() ) {
  130 + else if (this.isLeaf() || ( this.get('nodeType' ) == 'derivedParam' && this.get('isParameter')) ) {
131 131 itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
132 132 }
133   - else if (this.get('isParameter')) {
  133 + else if (this.get('isParameter') && this.get('nodeType' ) != 'derivedParam' ) {
134 134 itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
135 135 }
136 136 else if (this.get('rank')) {
... ...