diff --git a/modules/storm/stormtask/stormtask.admin.inc b/modules/storm/stormtask/stormtask.admin.inc index 59a793d..1e6a253 100644 --- a/modules/storm/stormtask/stormtask.admin.inc +++ b/modules/storm/stormtask/stormtask.admin.inc @@ -499,7 +499,7 @@ function stormtask_tasks_filter_reset($form, &$form_state) { function _stormtask_project_tasks_js($project_nid) { $tree = _stormtask_get_tree($project_nid); - $tasks = _stormtask_plain_tree($tree); + $tasks = _stormtask_plain_tree($tree, TRUE); print drupal_to_js($tasks); exit(); } diff --git a/modules/storm/stormtask/stormtask.module b/modules/storm/stormtask/stormtask.module index 4bff260..cf60160 100644 --- a/modules/storm/stormtask/stormtask.module +++ b/modules/storm/stormtask/stormtask.module @@ -1061,11 +1061,11 @@ function _stormtask_get_tree($project_nid, $parent_nid = 0, $depth = -1, $max_de return isset($tree) ? $tree : array(); } -function _stormtask_plain_tree($tree) { +function _stormtask_plain_tree($tree, $forjs = FALSE) { $rows = array(); foreach ($tree as $item) { - // Using the space character to preserve the order of tree elements: - $nid = " $item->nid"; + // Using the space char to preserve the order in Javascript loaded trees: + $nid = $forjs ? " $item->nid" : $item->nid; $title = htmlspecialchars_decode(check_plain($item->title)); if ($item->stepno) $title = check_plain($item->stepno) .' '. $title; if ($nid) $rows[$nid] = str_repeat('--', $item->depth) .' '. $title;