From 1bb54d20cf1ae4074b15089750faff286c145eb9 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Mon, 27 Jan 2020 17:05:32 +0100
Subject: [PATCH] Teams ordering fixed

---
 app/controllers/global_activities_controller.rb | 2 +-
 app/views/shared/_navigation.html.erb           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/global_activities_controller.rb b/app/controllers/global_activities_controller.rb
index 176a54630..dd83dde77 100644
--- a/app/controllers/global_activities_controller.rb
+++ b/app/controllers/global_activities_controller.rb
@@ -69,7 +69,7 @@ class GlobalActivitiesController < ApplicationController
   end
 
   def team_filter
-    render json: current_user.teams.global_activity_filter(activity_filters, params[:query])
+    render json: current_user.teams.order('LOWER(name)').global_activity_filter(activity_filters, params[:query])
   end
 
   def user_filter
diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index 8cf3b8f05..fc3483136 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -73,7 +73,7 @@
                   <%= hidden_field(:user, :current_team_id) %>
                   <div class="dropdown-header"><%= t('nav.team_switch_title') %></div>
                   <div class="team-container">
-                    <% current_user.teams.each do |team| %>
+                    <% current_user.teams.order('LOWER(name)').each do |team| %>
                       <li class="team-name-item">
                         <a href="#"
                           data-id="<%= team.id %>"
@@ -191,9 +191,9 @@
         </li>
         <li>
           <%= link_to Constants::ACADEMY_TR_LINK,
-                      class: "academy-link flag",
-                      title: I18n.t('nav.academy_tooltip'),
-                      target: :_blank do
+            class: "academy-link flag",
+            title: I18n.t('nav.academy_tooltip'),
+            target: :_blank do
           %>
             <div class="icon-container">
               <span class="fas fa-graduation-cap"></span>