From 6dbfb239c3bf687162eda48d7d846ce4622d92e7 Mon Sep 17 00:00:00 2001
From: thomaschen <99703040@nccu.edu.tw>
Date: Wed, 28 Aug 2013 11:43:57 +0800
Subject: [PATCH] sortable category

---
 .../front_end/dictionary_vocabs_controller.rb | 21 ++++++++-----------
 .../dictionary_vocabs/index.html.erb          |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb b/vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb
index b7aa6b11f..a912698fd 100644
--- a/vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb
+++ b/vendor/built_in_modules/dictionary/app/controllers/panel/dictionary/front_end/dictionary_vocabs_controller.rb
@@ -6,18 +6,6 @@ class Panel::Dictionary::FrontEnd::DictionaryVocabsController < OrbitWidgetContr
     @app_title = 'dictionary_vocabs'
   end
 
-  # def get_search_result
-  #     @search = ArchiveFileCategory.solr_search do 
-  #       fulltext params[:search_query]
-  #       with(:frontend_search,true)
-  #     end
-
-  #     search_result =  @search.results.collect{|result| result.id}
-  #     params[:category_id] = @search.results.collect{|result| result.id}
-
-  #     @archive_file_categorys = ArchiveFileCategory.any_in(_id:search_result).page( params[:page_main]).per(@page_num)
-  # end
-
   def index
     @item = Page.find(params[:page_id])
     @title = @item.title
@@ -34,6 +22,15 @@ class Panel::Dictionary::FrontEnd::DictionaryVocabsController < OrbitWidgetContr
         fulltext params[:search_query]
       end.results
     end
+
+    if !params[:category_id].blank?
+      @vocabs = DictionaryVocab.default_sort(params[:sort]).can_display.where(:dictionary_vocab_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @current_category = DictionaryVocabCategory.from_id(params[:category_id]) rescue nil
+    end
+
+    if params[:sort]
+      @vocabs = get_sorted_and_filtered('dictionary_vocab', nil, @vocabs)
+    end
     # @item = Page.find(params[:page_id])
     # @title = @item.title
     # if !@item.frontend_data_count.blank?
diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb
index c672aed6a..892ac7fc8 100644
--- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb
+++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb
@@ -4,7 +4,7 @@
 
       <thead>
         <tr>
-          <th class="span2"><%= t :category, :scope => :dictionary %></th>
+          <th class="span2"><%=  sortable(:category, t("dictionary.category"))%></th>
           <th class="span2"><%= t :word, :scope => :dictionary %></th>
           <th class="span2"><%= t :definition, :scope => :dictionary %></th>
         </tr>