diff --git a/js/app/views/DefaultTreeGrid.js b/js/app/views/DefaultTreeGrid.js index 2ca250b..7c745b9 100644 --- a/js/app/views/DefaultTreeGrid.js +++ b/js/app/views/DefaultTreeGrid.js @@ -49,6 +49,9 @@ Ext.define('amdaUI.DefaultTreeGrid', { }); editor.field = colorPicker; } + }, + afteredit:function(editor, context,e){ + console.log(context.record.get('default')); } } }); @@ -97,7 +100,6 @@ Ext.define('amdaUI.DefaultTreeGrid', { parameter = parentNode.get('parameter')+'.'.concat(parameter); } option = amdaDefaultOptions[parameter+record.get('parameter')]; - console.log(record.get('default')); value = record.get('value'); store = null; if(me.isHexCode(value)){ @@ -154,11 +156,11 @@ Ext.define('amdaUI.DefaultTreeGrid', { align: 'center', icon: 'js/resources/images/16x16/arrow_circle_double.png', handler: function(grid, rowIndex, colIndex, actionItem, event, record, row) { - Ext.Msg.alert('Editing' + record.get('parameter')); + record.set('value', record.get('default')); }, // Only leaf level tasks may be edited isDisabled: function(view, rowIdx, colIdx, item, record) { - return !record.data.leaf; + return !record.data.leaf || !record.data.modified; } } ], diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php index a40184e..63232e5 100644 --- a/php/classes/AmdaAction.php +++ b/php/classes/AmdaAction.php @@ -1764,15 +1764,13 @@ class AmdaAction $results = &$json_o; // Use a reference to update the original array foreach($keys as $parameter){ $results = &$results[$parameter]; + + error_log(print_r($results,true)); } - $results = array("value" => $value, "modified" => true, "defaultValue" => $results); - - // if(is_string($value) || is_numeric($value)) - // $results = "*".$value; - // if(is_bool($value)){ - // $results = $value ? "true":"false"; - // $results = "*".$results; - // } + if($isTree) + $results = array("value" => $value, "modified" => true, "defaultValue" => $results); + else + $results = $value; } } -- libgit2 0.21.2