From 03e1efe98e9fab3ef419a018fb90189936e868aa Mon Sep 17 00:00:00 2001
From: wandji <wbertrand10@gmail.com>
Date: Wed, 13 Dec 2023 15:13:15 +0100
Subject: [PATCH] Reloacate external_id for linked inventories [SCI-9849]
 (#6803)

---
 app/helpers/repository_datatable_helper.rb        | 14 +++++++-------
 app/views/repositories/_repository_table.html.erb |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb
index da512cc82..239a764b1 100644
--- a/app/helpers/repository_datatable_helper.rb
+++ b/app/helpers/repository_datatable_helper.rb
@@ -236,13 +236,13 @@ module RepositoryDatatableHelper
   def linked_repository_default_columns(record)
     {
       '1': assigned_row(record),
-      '2': escape_input(record.external_id),
-      '3': record.code,
-      '4': escape_input(record.name),
-      '5': I18n.l(record.created_at, format: :full),
-      '6': escape_input(record.created_by.full_name),
-      '7': (record.archived_on ? I18n.l(record.archived_on, format: :full) : ''),
-      '8': escape_input(record.archived_by&.full_name)
+      '2': record.code,
+      '3': escape_input(record.name),
+      '4': I18n.l(record.created_at, format: :full),
+      '5': escape_input(record.created_by.full_name),
+      '6': (record.archived_on ? I18n.l(record.archived_on, format: :full) : ''),
+      '7': escape_input(record.archived_by&.full_name),
+      '8': escape_input(record.external_id)
     }
   end
 
diff --git a/app/views/repositories/_repository_table.html.erb b/app/views/repositories/_repository_table.html.erb
index 30fdb67e0..010978982 100644
--- a/app/views/repositories/_repository_table.html.erb
+++ b/app/views/repositories/_repository_table.html.erb
@@ -35,15 +35,15 @@
           </div>
         </th>
         <th id="assigned" data-unmanageable="true"><%= t("repositories.table.assigned") %></th>
-        <% if @repository.is_a?(LinkedRepository) %>
-          <th id="row-external-id"><%= t('repositories.table.external_id') %></th>
-        <% end %>
         <th id="row-id"><%= t("repositories.table.id") %></th>
         <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>
         <th id="archived-on"><%= t("repositories.table.archived_on") %></th>
         <th id="archived-by"><%= t("repositories.table.archived_by") %></th>
+        <% if @repository.is_a?(LinkedRepository) %>
+          <th id="row-external-id"><%= t('repositories.table.external_id') %></th>
+        <% end %>
         <% repository.repository_columns.order(:id).each do |column| %>
           <th
             class="repository-column <%= 'row-stock item-stock' if column.data_type == 'RepositoryStockValue' %>"