CDPP / AMDA_IHM

Commit 663f63953705c96167f61ed5e8ce78f7a1703321

Authored by Elena.Budnik
1 parent e6065c11
Exists in master and in 109 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-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

nettoyage

Showing 2 changed files with 5 additions and 12 deletions   Show diff stats
Inline Side-by-side
js/app/models/InteractiveNode.js
  Diff comments   View file @663f639
... ... @@ -279,25 +279,23 @@ Ext.define('amdaModel.InteractiveNode', {
279 279 //TODO do we need this commission ???
280 280 // fix the modifications for object
281 281 this.get('object').commit();
  282 +
282 283 // if ownerTree panel is not active
283   - if (this.myGetOwnerTree().ownerCt.getActiveTab()!==this.myGetOwnerTree())
284   - {
  284 + if (this.myGetOwnerTree().ownerCt.getActiveTab()!==this.myGetOwnerTree()) {
285 285 // set ownerTree panel as the active tab - to enable selection of this node his ownerTree must have a view
286 286 this.myGetOwnerTree().ownerCt.setActiveTab(this.myGetOwnerTree());
287 287 }
288 288  
289 289 Ext.Msg.alert('Complete', 'New object '+this.get('object').get('name')+' has been created');
290 290 // expand the contextNode
291   - this.get('contextNode').expand(false, function()
292   - {
  291 + this.get('contextNode').expand(false, function() {
293 292 if (!this.get('contextNode').findChild('text',this.get('text'))) {
294 293 // create node in tree as child of contextNode
295 294 this.get('contextNode').appendChild(this);
296 295 }
297 296 // select the new node
298 297 this.myGetOwnerTree().getSelectionModel().select(this);
299   - if (opt)
300   - {
  298 + if (opt) {
301 299 var scope = opt.scope ? opt.scope : this;
302 300 if (opt.callback)
303 301 opt.callback.call(scope,'create');
... ...
js/app/models/PlotNode.js
  Diff comments   View file @663f639
... ... @@ -15,20 +15,15 @@
15 15  
16 16 Ext.define('amdaModel.PlotNode', {
17 17 extend: 'amdaModel.ExecutableNode',
18   -
19   - requires: [
20   - ],
21   -
  18 +
22 19 statics: {
23 20 nodeType: 'request'
24 21 },
25 22  
26 23 constructor : function(config){
27   -
28 24 this.callParent(arguments);
29 25 this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
30 26 this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
31   - this.set('ownerTreeId',amdaUI.ExplorerUI.OPE_TAB.TREE_ID);
32 27 this.set('nodeType',this.self.nodeType);
33 28 },
34 29  
... ...