Move org field above role

app/views/users/edit.html.erb

@@ -32,6 +32,24 @@
         autocomplete: "tel-extension",
         spellcheck: "false" %>
 
+      <% if UserPolicy.new(current_user, @user).edit_organisation? %>
+        <% null_option = [OpenStruct.new(id: "", name: "Select an option")] %>
+        <% organisations = Organisation.filter_by_active.map { |org| OpenStruct.new(id: org.id, name: org.name) } %>
+        <% answer_options = null_option + organisations %>
+
+        <%= f.govuk_select(:organisation_id,
+          label: { text: "Organisation", size: "m" },
+          "data-controller": "accessible-autocomplete") do %>
+            <% answer_options.each do |answer| %>
+              <option value="<%= answer.id %>"
+                data-synonyms="<%= answer_option_synonyms(answer.resource) %>"
+                data-append="<%= answer_option_append(answer.resource) %>"
+                data-hint="<%= answer_option_hint(answer.resource) %>"
+                <%= @user.organisation_id == answer.id ? "selected" : "" %>><%= answer.name || answer.resource %></option>
+            <% end %>
+        <% end %>
+      <% end %>
+
       <% if current_user.data_coordinator? || current_user.support? %>
         <% roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
 
@@ -42,24 +60,6 @@
           legend: { text: "Role", size: "m" } %>
       <% end %>
 
-      <% if UserPolicy.new(current_user, @user).edit_organisation? %>
-        <% null_option = [OpenStruct.new(id: "", name: "Select an option")] %>
-        <% organisations = Organisation.filter_by_active.map { |org| OpenStruct.new(id: org.id, name: org.name) } %>
-        <% answer_options = null_option + organisations %>
-
-          <%= f.govuk_select(:organisation_id,
-            label: { text: "Organisation", size: "m" },
-            "data-controller": "accessible-autocomplete") do %>
-              <% answer_options.each do |answer| %>
-                <option value="<%= answer.id %>"
-                  data-synonyms="<%= answer_option_synonyms(answer.resource) %>"
-                  data-append="<%= answer_option_append(answer.resource) %>"
-                  data-hint="<%= answer_option_hint(answer.resource) %>"
-                  <%= @user.organisation_id == answer.id ? "selected" : "" %>><%= answer.name || answer.resource %></option>
-              <% end %>
-          <% end %>
-        <% end %>
-
       <%= f.govuk_submit "Save changes" %>
     </div>
   </div>