From 9fc156c7d9ca8d0ce6535f55fde91c870370a971 Mon Sep 17 00:00:00 2001 From: Viktor Date: Mon, 14 May 2012 16:04:45 +0300 Subject: [PATCH 1/2] 190_categories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Сортировка имен тегов в алфавитном порядке --- app/controllers/administration/tags_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/administration/tags_controller.rb b/app/controllers/administration/tags_controller.rb index 9374ebd..aade736 100644 --- a/app/controllers/administration/tags_controller.rb +++ b/app/controllers/administration/tags_controller.rb @@ -4,7 +4,7 @@ class Administration::TagsController < Administration::MainController before_filter :find_tag, :only => [:edit, :update, :destroy!, :destroy] def index - @search = Tag.search(params[:search] || {"meta_sort" => "id.asc"}) + @search = Tag.search(params[:search] || {"meta_sort" => "name.asc"}) @tags = @search.paginate(:per_page => 20, :page => params[:page]) end From 8a38f079914580076c974178e0ec01e3b682d7f7 Mon Sep 17 00:00:00 2001 From: Viktor Date: Tue, 15 May 2012 10:06:52 +0300 Subject: [PATCH 2/2] 190_Categories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлена сортировка в Categories --- app/controllers/administration/tags_controller.rb | 2 +- app/controllers/application_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/administration/tags_controller.rb b/app/controllers/administration/tags_controller.rb index aade736..9374ebd 100644 --- a/app/controllers/administration/tags_controller.rb +++ b/app/controllers/administration/tags_controller.rb @@ -4,7 +4,7 @@ class Administration::TagsController < Administration::MainController before_filter :find_tag, :only => [:edit, :update, :destroy!, :destroy] def index - @search = Tag.search(params[:search] || {"meta_sort" => "name.asc"}) + @search = Tag.search(params[:search] || {"meta_sort" => "id.asc"}) @tags = @search.paginate(:per_page => 20, :page => params[:page]) end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2b417c7..aefe040 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base before_filter :find_all_tags, :except => [:create] def find_all_tags - @tags = Tag.where("status='false'") + @tags = Tag.where("status='false'").order("name ASC") end protected