fix select item translation

[pettanr/pettanr.git] / app / controllers / folders_controller.rb

diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb
index e57b03b..07ae91a 100644 (file)
--- a/app/controllers/folders_controller.rb
+++ b/app/controllers/folders_controller.rb
@@ -6,16 +6,18 @@ class FoldersController < ApplicationController
     before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   end
   
-  def self.model
-    Folder
-  end
-  
   def root
     set_model
     @item = Folder.root
-    respond_to do |format|
-      children_html_format format
-      children_json_format format
+    if params[:ref]
+      respond_to do |format|
+        show_json_format format
+      end
+    else
+      respond_to do |format|
+        children_html_format format
+        children_json_format format
+      end
     end
   end
   
@@ -32,7 +34,7 @@ class FoldersController < ApplicationController
   
   def children_html_format format
     format.html {
-      @filer = Locmare::Filer.new self.class.model.item_name, @item.children, nil, :none, @operators
+      @filer = Locmare::Filer.new Folder.item_name, @item.children, nil, @operators
       render :action => :show
     }
   end
@@ -40,7 +42,7 @@ class FoldersController < ApplicationController
   def children_json_format format
     format.json {
       @items = @item.children
-      render json: @items.to_json(self.class.model.list_json_opt)
+      render json: @items.to_json(Folder.list_json_opt)
     }
   end
   
@@ -68,4 +70,8 @@ class FoldersController < ApplicationController
     end
   end
   
+  def count
+    list_count
+  end
+  
 end