temp

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

diff --git a/app/controllers/licenses_controller.rb b/app/controllers/licenses_controller.rb
index 2754dd2..a365198 100644 (file)
--- a/app/controllers/licenses_controller.rb
+++ b/app/controllers/licenses_controller.rb
@@ -2,30 +2,24 @@ class LicensesController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
-  # GET /licenses
-  # GET /licenses.json
+  @@model = License
   def index
-    @licenses = License.list()
+    set_filer
 
     respond_to do |format|
-      format.html {
-        render :template => 'system/filer', :locals => {
-          :items => @licenses, :model => License, 
-          :roles => [@user, @admin], :pager => nil
-        }
-      }
-      format.json { render json: @licenses.to_json(License.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
 
-  # GET /licenses/1
-  # GET /licenses/1.json
   def show
-    @license = License.show(params[:id])
+    @item = License.show(params[:id], @operators)
     respond_to do |format|
-      format.html # show.html.erb
-      format.prof  { render :template => 'top/prof', :layout => true }
-      format.json { render json: @license.to_json(License.show_json_opt) }
+      format.html {
+        @license = @item
+      }
+      format_prof format
+      format.json { render json: @item.to_json(License.show_json_opt) }
     end
   end