refactoring

nastachku · Feb 21, 2013 · dbcb662 · dbcb662
1 parent a18d7ac
commit dbcb662
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/app/controllers/web/admin/users_controller.rb b/app/controllers/web/admin/users_controller.rb
@@ -16,8 +16,12 @@ def create
   end
 
   def index
-    @search = User.search(params[:q])
-    @users = @search.result.alphabetically.page(params[:page]).per(50)
+    @search = User.ransack(params[:q])
+    if params[:q]
+      @users = @search.result.page(params[:page]).per(50)
+    else
+      @users = @search.result.alphabetically.page(params[:page]).per(50)
+    end
   end
 
   def show

diff --git a/app/controllers/web/users_controller.rb b/app/controllers/web/users_controller.rb
@@ -1,8 +1,13 @@
 class Web::UsersController < Web::ApplicationController
 
   def index
-    @search = User.search(params[:q])
-    @users = @search.result.activated.shown_as_participants.alphabetically
+    @search = User.ransack(params[:q])
+    if params[:q]
+      @users = @search.result.activated.shown_as_participants
+    else
+      @users = @search.result.activated.shown_as_participants.alphabetically
+    end
+
   end
 
   def new

diff --git a/app/views/web/admin/users/index.html.haml b/app/views/web/admin/users/index.html.haml
@@ -1,6 +1,6 @@
 .page-header
   %h1=t('.title')
-
+/ FIXME vdv73rus, form-inline not work
 = simple_form_for @search, url: admin_users_path, method: :get, html: { class: 'form-inline' } do |f|
   .form-inputs
     = f.input :last_name_cont, label: t(".last_name"), required: false

diff --git a/app/views/web/users/index.html.haml b/app/views/web/users/index.html.haml
@@ -1,6 +1,5 @@
 %h1=t '.title'
-%h3=t '.registred', activated_count: User.activated.count
-%h3=t '.participants', participants_count: User.activated.shown_as_participants.count
+%h5=t '.registred_title', activated_count: User.activated.count, participants_count: User.activated.shown_as_participants.count
 %table.table.table-striped
   %thead
     %tr

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -56,8 +56,8 @@ ru:
 
       index:
         title: 'Пойдут на стачку'
-        registred: "Зарегистрировалось – %{activated_count}."
-        participants: "%{participants_count}, кто согласился рассказать о себе."
+        # TODO add pluralize word "участников
+        registred_title: "Зарегистрировалось – %{activated_count} участников. Ниже %{participants_count}, кто согласился рассказать о себе."
 
     welcome:
       index: