From b2fdbde020b3e26f8614c0f7251761a145bf1c72 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Fri, 15 Sep 2017 09:14:25 +0200 Subject: [PATCH] Fixed order of tasks in selections with ajax loaded data --- modules/storm/stormtask/stormtask.js | 1 - modules/storm/stormtask/stormtask.module | 3 ++- modules/storm/stormticket/stormticket.js | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/storm/stormtask/stormtask.js b/modules/storm/stormtask/stormtask.js index a00ce6a..635cbc7 100644 --- a/modules/storm/stormtask/stormtask.js +++ b/modules/storm/stormtask/stormtask.js @@ -41,4 +41,3 @@ function stormtask_organization_project_tasks(_organization_select, _project_sel var _organization_select_id = $(_organization_select).attr('id'); stormtask_project_tasks(_organization_select_id, project_select, _task_select_id, _assign_select_id, _with_all_option, _all_text); }; - diff --git a/modules/storm/stormtask/stormtask.module b/modules/storm/stormtask/stormtask.module index 43f16a6..07e7a9f 100644 --- a/modules/storm/stormtask/stormtask.module +++ b/modules/storm/stormtask/stormtask.module @@ -1063,7 +1063,8 @@ function _stormtask_get_tree($project_nid, $parent_nid = 0, $depth = -1, $max_de function _stormtask_plain_tree($tree) { $rows = array(); foreach ($tree as $item) { - $nid = $item->nid; + // Using the space character to preserve the order of tree elements: + $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; diff --git a/modules/storm/stormticket/stormticket.js b/modules/storm/stormticket/stormticket.js index 72183d9..de2a05a 100644 --- a/modules/storm/stormticket/stormticket.js +++ b/modules/storm/stormticket/stormticket.js @@ -17,7 +17,7 @@ function stormticket_task_tickets(_task_select, _organization_select_id, _projec $.ajax({ type: "GET", async: true, - url: Drupal.settings.storm.task_tickets_url + Drupal.encodeURIComponent(organization_nid) + + url: Drupal.settings.storm.task_tickets_url + Drupal.encodeURIComponent(organization_nid) + '/' + Drupal.encodeURIComponent(project_nid) + '/' + Drupal.encodeURIComponent(task_nid), dataType: "string", @@ -39,4 +39,3 @@ function stormticket_organization_project_task_tickets(_organization_select, _pr var project_select = $("#" + _project_select_id).get(0); stormticket_project_task_tickets(project_select, _organization_select.id, _task_select_id, _ticket_select_id, _with_all_option, _all_text); }; -