From 17b4f4e7319b95f001f2a6269881d7516ac99fee Mon Sep 17 00:00:00 2001 From: David Reyna Date: Sun, 3 Sep 2017 21:02:23 -0700 Subject: [PATCH] bitbake: toaster: edit column list not sorted The list of columns in the many 'Edit Columns' pop-ups became unsorted with the 'Toaster Table' implementation. These entries need to be gathered and sorted in the column processing. [YOCTO #12004] (Bitbake rev: d06a8ff74be11e4315feac6768064355ec15611f) Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/static/js/table.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bitbake/lib/toaster/toastergui/static/js/table.js b/bitbake/lib/toaster/toastergui/static/js/table.js index 1bbc8d1b5a..abcb5ca7a0 100644 --- a/bitbake/lib/toaster/toastergui/static/js/table.js +++ b/bitbake/lib/toaster/toastergui/static/js/table.js @@ -202,6 +202,7 @@ function tableInit(ctx){ } /* Add table header and column toggle menu */ + var column_edit_entries = []; for (var i in tableData.columns){ var col = tableData.columns[i]; if (col.displayable === false) { @@ -293,9 +294,17 @@ function tableInit(ctx){ defaultHiddenCols.push(col.field_name); } - editColMenu.append(toggler); + /* Gather the Edit Column entries */ + column_edit_entries.push({'title':col.title,'html':toggler}); + } /* End for each column */ + /* Append the sorted Edit Column toggler entries */ + column_edit_entries.sort(function(a,b) {return (a.title > b.title) ? 1 : ((b.title > a.title) ? -1 : 0);} ); + for (var col in column_edit_entries){ + editColMenu.append(column_edit_entries[col].html); + } + tableChromeDone = true; }