CDPP / AMDA_IHM

Commit 11d21073c77e3d050a6d0f47c10353805df4df9f

Authored by Nathanaël Jourdane
1 parent 36904910
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, 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, 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

Fix bugs when creating and renaming folders

Showing 2 changed files with 32 additions and 28 deletions   Show diff stats
Inline Side-by-side
js/app/models/InteractiveNode.js
  Diff comments   View file @11d2107
... ... @@ -146,7 +146,7 @@ Ext.define('amdaModel.InteractiveNode', {
146 146 */
147 147 rename: function(value,callBackFn)
148 148 {
149   - var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value, parent : this.parentNode.get('id'), leaf: this.isLeaf(), nodeType: this.get('nodeType')};
  149 + var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value, parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
150 150 AmdaAction.renameObject(dataToSend, callBackFn);
151 151 },
152 152  
... ... @@ -442,7 +442,7 @@ Ext.define('amdaModel.InteractiveNode', {
442 442 this.createLeaf(this);
443 443 break;
444 444 case 'renameNode':
445   - this.renameNode();
  445 + this.renameNode(false);
446 446 break;
447 447 case 'editLeaf':
448 448 this.editLeaf();
... ... @@ -704,7 +704,8 @@ Ext.define('amdaModel.InteractiveNode', {
704 704 {
705 705 leaf : false, nodeType : me.get('nodeType'),
706 706 text : amdaModel.AmdaNode.NEW_DIR_NAME,
707   - children : []
  707 + children : [],
  708 + parentId: me.get('id')
708 709 });
709 710  
710 711 // insert the new node as a child of node
... ... @@ -716,7 +717,7 @@ Ext.define('amdaModel.InteractiveNode', {
716 717 // select the new node
717 718 me.myGetOwnerTree().getSelectionModel().select(newNode);
718 719 // call the renameNode method for this new node
719   - newNode.renameNode();
  720 + newNode.renameNode(true);
720 721 });
721 722 },
722 723  
... ... @@ -736,7 +737,7 @@ Ext.define('amdaModel.InteractiveNode', {
736 737 });
737 738 },
738 739  
739   - renameNode: function()
  740 + renameNode: function(deleteOnFailure)
740 741 {
741 742 if (this.myGetOwnerTree())
742 743 {
... ... @@ -746,8 +747,10 @@ Ext.define('amdaModel.InteractiveNode', {
746 747 function()
747 748 {
748 749 // fire the edition event on tree
749   - me.myGetOwnerTree().fireEvent('edition',me.myGetOwnerTree().view, me.myGetOwnerTree().getSelectionModel().selected.items[0]);
750   - });
  750 + var item = me.myGetOwnerTree().getSelectionModel().selected.items[0];
  751 + item.deleteOnFailure = deleteOnFailure;
  752 + me.myGetOwnerTree().fireEvent('edition', me.myGetOwnerTree().view, item);
  753 + });
751 754 }
752 755 else
753 756 {
... ...
js/app/views/ExplorerUI.js
  Diff comments   View file @11d2107
... ... @@ -719,9 +719,7 @@ Ext.define('amdaUI.ExplorerUI', {
719 719 validFlag = 'Invalid object name';
720 720 }
721 721 }
722   - if (validFlag === true) {
723   - field.lastValid = newValue;
724   - } else {
  722 + if (validFlag !== true) {
725 723 field.markInvalid(validFlag);
726 724 }
727 725 field.validFlag = validFlag;
... ... @@ -732,25 +730,28 @@ Ext.define('amdaUI.ExplorerUI', {
732 730 scope: this
733 731 }
734 732 }],
735   - //add our custom editor plugin
736   - plugins: [ new MyTreeEditor({
737   - pluginId: 'treeEditor',
738   - listeners: {
739   - 'edit': function (editor, e) {
740   - if(e.column.field.validFlag !== true) {
741   - if(e.column.field.lastValid) {
742   - e.record.data[e.field] = e.column.field.lastValid;
743   - } else {
744   - e.record.remove(true);
745   - }
  733 + // Add our custom editor plugin
  734 + plugins: [
  735 + new MyTreeEditor({
  736 + pluginId: 'treeEditor',
  737 + listeners: {
  738 + beforeedit: function (editor, e) {
  739 + e.column.field.fireEvent('change', e.column.field, e.value, '');
  740 + },
  741 + validateedit: function (editor, e) {
  742 + if (e.column.field.validFlag !== true) {
  743 + if (e.record.deleteOnFailure) {
  744 + e.record.remove(true);
  745 + } else {
  746 + return false;
  747 + }
  748 + }
  749 + return true;
746 750 }
747   - },
748   - 'beforeedit': function (editor, e) {
749   - e.column.field.fireEvent('change', e.column.field, e.value, '');
750   - }
751   - },
752   - scope: this
753   - })],
  751 + },
  752 + scope: this
  753 + })
  754 + ],
754 755  
755 756 setNodesVisibility : function(node,forceHide)
756 757 {
... ...