t#31056:add diff import

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

diff --git a/app/controllers/license_groups_controller.rb b/app/controllers/license_groups_controller.rb
index 7d3aa4b..4433053 100644 (file)
--- a/app/controllers/license_groups_controller.rb
+++ b/app/controllers/license_groups_controller.rb
@@ -1,11 +1,11 @@
 class LicenseGroupsController < ApplicationController
-  layout 'test' if Pettanr::TestLayout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_admin!, :only => [:list, :browse]
   
   # GET /license_groups
   # GET /license_groups.json
   def index
-    @license_groups = LicenseGroup.list({})
+    @license_groups = LicenseGroup.list()
 
     respond_to do |format|
       format.html # index.html.erb
@@ -19,7 +19,7 @@ class LicenseGroupsController < ApplicationController
     @license_group = LicenseGroup.show(params[:id])
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @license_group.to_json(LicenseGroup.show_json_include_opt) }
+      format.json { render json: @license_group.to_json(LicenseGroup.show_json_opt) }
     end
   end