CDPP / AMDA_IHM

Commit da0e0b8babcdaf409a3eeab69562427903812073

Authored by Elena.Budnik
1 parent af97ef56
Exists in master and in 112 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, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, 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

url for association also

Showing 1 changed file with 9 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/models/FilterInfo.js
  Diff comments   View file @da0e0b8
... ... @@ -53,6 +53,9 @@ Ext.define('amdaModel.FilterSelectListElt', {
53 53  
54 54 proxy: {
55 55 type: 'ajax',
  56 + //TODO url into general settings
  57 + // Elena - here URL is also needed
  58 + url : 'generic_data/Filters/filters_selectLists.xml',
56 59 reader: {
57 60 type: 'xml',
58 61 root: 'elts',
... ... @@ -65,9 +68,9 @@ Ext.define('amdaModel.FilterSelectList', {
65 68 extend : 'Ext.data.Model',
66 69 idProperty : 'id',
67 70  
68   - requires : [
69   - 'amdaModel.FilterSelectListElt'
70   - ],
  71 +// requires : [
  72 +// 'amdaModel.FilterSelectListElt'
  73 +// ],
71 74  
72 75 fields : [
73 76 {name: 'id', mapping: '@id', type:'string'}
... ... @@ -81,7 +84,7 @@ Ext.define('amdaModel.FilterSelectList', {
81 84 proxy: {
82 85 type: 'ajax',
83 86 //TODO url into general settings
84   - url : 'generic_data/Filters/filters_selectLists.xml',
  87 + url : 'generic_data/Filters/filters_selectLists.xml',
85 88 reader: {
86 89 type: 'xml',
87 90 root: 'selectLists',
... ... @@ -110,9 +113,9 @@ Ext.define('amdaModel.FilterOpInfo', {
110 113 ],
111 114  
112 115 proxy: {
113   - type: 'ajax',
  116 + type: 'ajax',
114 117 reader: {
115   - type: 'xml',
  118 + type: 'xml',
116 119 root: 'ops',
117 120 record : 'op'
118 121 }
... ...