CDPP / AMDA_IHM

Commit fae756e0b7cc885fbef684d1d6bac7742c0deab5

Authored by Myriam Bouchemit
2 parents ddfe608e e63ad8ec
Exists in master and in 111 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, 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

Merge branch 'fix-mysterious-firefox-bug' into 'master' 

Fix mysterious firefox bug

This PR renames the module "Statistics" to "Stats", because add blockers don't like this name.

See merge request !3
Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/ExplorerModule.js
  Diff comments   View file @fae756e
... ... @@ -37,7 +37,7 @@ Ext.define('amdaDesktop.ExplorerModule',
37 37 'amdaModel.Download',
38 38 'amdaModel.TimeTable',
39 39 'amdaModel.Catalog',
40   - 'amdaModel.Statistics',
  40 + 'amdaModel.Stats',
41 41 'amdaModel.FileObject',
42 42 'amdaModel.FileParamObject',
43 43 'amdaModel.FilterInfo'
... ...
js/app/controllers/StatisticsModule.js
  Diff comments   View file @fae756e
... ... @@ -21,7 +21,7 @@ Ext.define('amdaDesktop.StatisticsModule', {
21 21 * @required
22 22 */
23 23 nodeDataModel : 'amdaModel.StatisticsNode',
24   - objectDataModel : 'amdaModel.Statistics',
  24 + objectDataModel : 'amdaModel.Stats',
25 25 /**
26 26 * @cfg {String} window definitions
27 27 * @required
... ...
js/app/models/Statistics.js renamed to js/app/models/Stats.js
  Diff comments   View file @fae756e
1 1 /**
2 2 * Project : AMDA-NG
3   - * Name : Statistics.js
  3 + * Name : Stats.js
4 4 * Description : Statistics Object Definition
5   - * @class amdaModel.Statistics
  5 + * @class amdaModel.Stats
6 6 * @extends amdaModel.TimeTable
7 7 * @author elena
8 8 */
9 9  
10   -Ext.define('amdaModel.Statistics', {
  10 +Ext.define('amdaModel.Stats', {
11 11 extend: 'amdaModel.AmdaTimeObject',
12 12  
13 13 fields : [
... ... @@ -79,4 +79,4 @@ Ext.define('amdaModel.Statistics', {
79 79  
80 80 return values;
81 81 }
82   -});
83 82 \ No newline at end of file
  83 +});
... ...