Move org field above role

app/views/users/edit.html.erb

@@ -32,16 +32,6 @@
         autocomplete: "tel-extension",
         spellcheck: "false" %>
 
-      <% if current_user.data_coordinator? || current_user.support? %>
-        <% roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
-
-        <%= f.govuk_collection_radio_buttons :role,
-          roles,
-          :id,
-          :name,
-          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) } %>
@@ -60,6 +50,16 @@
         <% 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) } %>
+
+        <%= f.govuk_collection_radio_buttons :role,
+          roles,
+          :id,
+          :name,
+          legend: { text: "Role", size: "m" } %>
+      <% end %>
+
       <%= f.govuk_submit "Save changes" %>
     </div>
   </div>