fix participants page

nastachku · Feb 13, 2013 · 78fe13c · 78fe13c
1 parent 5ae103d
commit 78fe13c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/web/users_controller.rb b/app/controllers/web/users_controller.rb
@@ -1,7 +1,7 @@
 class Web::UsersController < Web::ApplicationController
 
   def index
-    @users = User.shown_as_participants
+    @users = User.shown_as_participants.alphabetically
   end
 
   def new

diff --git a/app/repositories/user_repository.rb b/app/repositories/user_repository.rb
@@ -9,6 +9,8 @@ module UserRepository
     scope :shown_as_participants, -> {
       where show_as_participant: true
     }
+
+    scope :alphabetically, -> { order("first_name, last_name ASC") }
   end
 
 end
diff --git a/app/views/layouts/web/shared/_navigation.html.haml b/app/views/layouts/web/shared/_navigation.html.haml
@@ -17,7 +17,7 @@
           %li= link_to t(".news"), news_index_path
           %li= link_to t(".routes"), page_path(:routes)
           %li= link_to t(".contacts"), page_path(:contacts)
-          %li= link_to t(".afterpaty"), page_path(:afterpaty)
+          / %li= link_to t(".afterpaty"), page_path(:afterpaty)
 
           - if signed_as_admin?
             %li= link_to t(".admin"), admin_root_path

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -8,7 +8,7 @@ ru:
       shared:
         navigation:
           title: 'Стачка!'
-          participants: 'Кто идёт?'
+          participants: 'Участники'
           logout: 'Выйти'
           admin: 'Админка'
           i_will_go: 'Я пойду'