lib/generators/scaffold_admin/templates/controller.rb in zscaffold_admin-0.0.3 vs lib/generators/scaffold_admin/templates/controller.rb in zscaffold_admin-0.0.4

@@ -1,64 +1,60 @@
 <%- if namespace_name -%>
 module <%= module_name %>
 <%- end -%>
-class <%= plural_class %>Controller < ApplicationController    
-  
-  before_filter :init, :only => [:show, :edit, :update, :destroy]
-  
-  layout 'admin'   
-  respond_to :html, :xml, :js
+class <%= plural_class %>Controller < ApplicationController
 
+  layout 'admin'
+  respond_to :html, :json
+
   def index
-    @<%= plural_name %> = <%= class_name %>.order 'created_at DESC'
-    
+    @<%= plural_name %> = <%= class_name %>.paginate(page: params[:page], per_page: 10).order('created_at DESC')
+
     respond_with @<%= plural_name %>
   end
-    
-  def show   
+
+  def show
+    @<%= singular_name %> = get_register(params[:id])
     respond_with @<%= singular_name %>
   end
 
   def new
     @<%= singular_name %> = <%= class_name %>.new
-    
+
     respond_with @<%= singular_name %>
   end
 
   def edit
+    @<%= singular_name %> = get_register(params[:id])
     respond_with @<%= singular_name %>
   end
 
   def create
     @<%= singular_name %> = <%= class_name %>.new params[:<%= singular_name %>]
-    
-    if @<%= singular_name %>.save
-      flash[:notice] = I18n.t :<%= singular_name %>_created
-      respond_with @<%= singular_name %>
-    else
-      render :action => :new
-    end
+
+    flash[:notice] = t :<%= singular_name %>_created if @<%= singular_name %>.save
+    respond_with @<%= singular_name %>
   end
 
-  def update 
-    if @<%= singular_name %>.update_attributes params[:<%= singular_name %>]
-      flash[:notice] = I18n.t :<%= singular_name %>_updated
-      respond_with @<%= singular_name %>
-    else
-      render :action => :edit
-    end
+  def update
+    @<%= singular_name %> = get_register(params[:id])
+
+    flash[:notice] = t :<%= singular_name %>_updated if @<%= singular_name %>.update_attributes params[:<%= singular_name %>]
+    respond_with @<%= singular_name %>
   end
 
   def destroy
+    @<%= singular_name %> = get_register(params[:id])
     @<%= singular_name %>.destroy
-    
+
     respond_with @<%= singular_name %>
   end
-  
-  def init
-    @<%= singular_name %> = <%= class_name %>.where(:id => params[:id]).first
+
+  private
+  def get_register(id)
+    <%= class_name %>.find(id)
   end
-    
+
 end
-<%- if namespace_name -%>  
+<%- if namespace_name -%>
 end
 <%- end -%>