From a6b80589f2466f481c14996a3f619465c5b3fa65 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Mon, 10 Jul 2017 15:32:18 +0200
Subject: [PATCH] Fix default order of the columns in repositories [SCI-1445]

---
 app/assets/javascripts/repositories/repository_datatable.js | 1 -
 app/views/repositories/_repository_table.html.erb           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index 3ceeab6ff..f60e0e0d9 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -148,7 +148,6 @@ function dataTableInit() {
         data = myData;
       }
       $.ajax({
-        async: false,
         url: '/repositories/' + repositoryId + '/state_save',
         data: {state: data},
         dataType: 'json',
diff --git a/app/views/repositories/_repository_table.html.erb b/app/views/repositories/_repository_table.html.erb
index 3147dae51..d53c963f1 100644
--- a/app/views/repositories/_repository_table.html.erb
+++ b/app/views/repositories/_repository_table.html.erb
@@ -19,7 +19,7 @@
         <th id="row-name"><%= t("repositories.table.row_name") %></th>
         <th id="added-on"><%= t("repositories.table.added_on") %></th>
         <th id="added-by"><%= t("repositories.table.added_by") %></th>
-        <% repository.repository_columns.each do |column| %>
+        <% repository.repository_columns.order(:id).each do |column| %>
           <th class="repository-column" id="<%= column.id %>"
             <%= 'data-editable' if can_edit_column_in_repository(column) %>
             <%= 'data-deletable' if can_delete_column_in_repository(column) %>