spree_core 0.50.4 → 0.60.0.RC1

data/app/controllers/admin/tax_categories_controller.rb

@@ -1,13 +1,2 @@
-class Admin::TaxCategoriesController < Admin::BaseController
-  resource_controller
-
-  create.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-
-  update.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-
-  destroy.success.wants.js { render_js_for_destroy }
+class Admin::TaxCategoriesController < Admin::ResourceController
 end

data/app/controllers/admin/tax_rates_controller.rb

@@ -1,21 +1,11 @@
-class Admin::TaxRatesController < Admin::BaseController
-  resource_controller
+class Admin::TaxRatesController < Admin::ResourceController
   before_filter :load_data
 
-  create.success.wants.html { redirect_to collection_url }
-  update.success.wants.html { redirect_to collection_url }
-  destroy.success.wants.js { render_js_for_destroy }
-
   update.after :update_after
   create.after :create_after
 
   private
-  def build_object
-    @object ||= end_of_association_chain.send((parent? ? :build : :new), object_params)
-    @object.calculator = params[:tax_rate][:calculator_type].constantize.new if params[:tax_rate]
-    @object.calculator ||= Calculator::SalesTax.new
-    @object
-  end
+  
   def load_data
     @available_zones = Zone.order(:name)
     @available_categories = TaxCategory.order(:name)

data/app/controllers/admin/taxonomies_controller.rb

@@ -1,17 +1,16 @@
-class Admin::TaxonomiesController < Admin::BaseController
-  resource_controller
-
-  create.wants.html {redirect_to edit_admin_taxonomy_url(@taxonomy)}
-  update.wants.html {redirect_to collection_url}
-
-  edit.response do |wants|
-    wants.html
-    wants.js do
-      render :partial => 'edit.html.erb'
-    end
-  end
+class Admin::TaxonomiesController < Admin::ResourceController
 
   def get_children
     @taxons = Taxon.find(params[:parent_id]).children
   end
+  
+  private
+  
+  def location_after_save
+    if @taxonomy.created_at == @taxonomy.updated_at
+      edit_admin_taxonomy_url(@taxonomy)
+    else
+      admin_taxonomies_url
+    end
+  end
 end

data/app/controllers/admin/taxons_controller.rb

@@ -1,60 +1,26 @@
 class Admin::TaxonsController < Admin::BaseController
   include Railslove::Plugins::FindByParam::SingletonMethods
-  resource_controller
-  before_filter :load_object, :only => [:selected, :available, :remove]
-  before_filter :load_permalink_part, :only => :edit
-  belongs_to :product, :taxonomy
 
-  create.wants.html {render :text => @taxon.id}
-  update.wants.html {redirect_to edit_admin_taxonomy_url(@taxonomy)}
-  update.wants.json {render :json => @taxon.to_json()}
-
-  destroy.wants.html {render :text => ""}
-  destroy.success.wants.js { render_js_for_destroy }
-
-  create.before :create_before
-  update.before :update_before
-  update.after :update_after
-
-  def selected
-    @taxons = @product.taxons
-  end
-
-  def available
-    if params[:q].blank?
-      @available_taxons = []
+  def create
+    @taxonomy = Taxonomy.find(params[:taxonomy_id])
+    @taxon = @taxonomy.taxons.build(params[:taxon])
+    if @taxon.save
+      render :text => @taxon
     else
-      @available_taxons = Taxon.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%")
-    end
-    @available_taxons.delete_if { |taxon| @product.taxons.include?(taxon) }
-    respond_to do |format|
-      format.js {render :layout => false}
+      flash[:error] = I18n.t('errors.messages.could_not_create_taxon')
+      redirect_to @taxonomy ? edit_admin_taxonomy_url(@taxonomy) : admin_taxonomies_url
     end
-
   end
 
-  def remove
-    @product.taxons.delete(@taxon)
-    @product.save
-    @taxons = @product.taxons
-    render_js_for_destroy
-  end
-
-  def select
-    @product = Product.find_by_param!(params[:product_id])
-    @taxon = Taxon.find(params[:id])
-    @product.taxons << @taxon
-    @product.save
-    @taxons = @product.taxons
-    render :layout => false
+  def edit
+    @taxonomy = Taxonomy.find(params[:taxonomy_id])
+    @taxon = @taxonomy.taxons.find(params[:id])
+    @permalink_part = @taxon.permalink.split("/").last
   end
 
-  private
-  def create_before
-    @taxon.taxonomy_id = params[:taxonomy_id]
-  end
-
-  def update_before
+  def update
+    @taxonomy = Taxonomy.find(params[:taxonomy_id])
+    @taxon = @taxonomy.taxons.find(params[:id])
     parent_id = params[:taxon][:parent_id]
     new_position = params[:taxon][:position]
 
@@ -84,7 +50,7 @@ class Admin::TaxonsController < Admin::BaseController
       end
       # Reset legacy position, if any extensions still rely on it
       new_parent.children.reload.each{|t| t.update_attribute(:position, t.position)}
-
+      
       if parent_id
         @taxon.reload
         @taxon.set_permalink
@@ -100,9 +66,11 @@ class Admin::TaxonsController < Admin::BaseController
     end
     #check if we need to rename child taxons if parent name or permalink changes
     @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
-  end
 
-  def update_after
+    if @taxon.update_attributes(params[:taxon])
+      flash[:notice] = I18n.t(:successfully_updated, :resource => I18n.t(:taxon) + " \"#{@taxon.name}\"")
+    end
+
     #rename child taxons
     if @update_children
       @taxon.descendants.each do |taxon|
@@ -111,9 +79,62 @@ class Admin::TaxonsController < Admin::BaseController
         taxon.save!
       end
     end
+    
+    respond_to do |format|
+      format.html {redirect_to edit_admin_taxonomy_url(@taxonomy) }
+      format.json {render :json => @taxon.to_json }
+    end
+  end
+
+  def destroy
+    @taxon = Taxon.find(params[:id])
+    @taxon.destroy
+    respond_to do |format|
+      format.html { render :text => '' }
+      format.js { render_js_for_destroy }
+    end
+  end
+
+  def selected
+    @product = load_product
+    @taxons = @product.taxons
   end
 
-  def load_permalink_part
-    @permalink_part = object.permalink.split("/").last
+  def available
+    @product = load_product
+    if params[:q].blank?
+      @available_taxons = []
+    else
+      @available_taxons = Taxon.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%")
+    end
+    @available_taxons.delete_if { |taxon| @product.taxons.include?(taxon) }
+    respond_to do |format|
+      format.js {render :layout => false}
+    end
   end
+
+  def remove
+    @product = load_product
+    @taxon = Taxon.find(params[:id])
+    @product.taxons.delete(@taxon)
+    @product.save
+    @taxons = @product.taxons
+    render_js_for_destroy
+  end
+
+  def select
+    @product = load_product
+    @taxon = Taxon.find(params[:id])
+    @product.taxons << @taxon
+    @product.save
+    @taxons = @product.taxons
+    render :layout => false
+  end
+
+  private
+
+  def load_product
+    Product.find_by_permalink! params[:product_id]
+  end
+
 end

data/app/controllers/admin/trackers_controller.rb

@@ -1,7 +1,2 @@
-class Admin::TrackersController < Admin::BaseController
-  resource_controller
-
-  update.wants.html { redirect_to collection_url }
-  create.wants.html { redirect_to collection_url }
-
+class Admin::TrackersController < Admin::ResourceController
 end

data/app/controllers/admin/users_controller.rb

@@ -1,6 +1,4 @@
-class Admin::UsersController < Admin::BaseController
-  resource_controller
-
+class Admin::UsersController < Admin::ResourceController
   # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
   before_filter :check_json_authenticity, :only => :index
   before_filter :load_roles, :only => [:edit, :new, :update, :create]
@@ -8,13 +6,43 @@ class Admin::UsersController < Admin::BaseController
   create.after :save_user_roles
   update.before :save_user_roles
 
-  index.response do |wants|
-    wants.html { render :action => :index }
-    wants.json { render :json => json_data }
+  def index
+    respond_to do |format|
+      format.html
+      format.json { render :json => json_data }
+    end
   end
 
-  destroy.success.wants.js { render_js_for_destroy }
-
+  protected
+  
+  def collection
+    return @collection if @collection.present?
+    unless request.xhr?
+      @search = User.registered.metasearch(params[:search])
+      @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
+    else
+      @collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).
+                        where("users.email #{LIKE} :search
+                               OR addresses.firstname #{LIKE} :search
+                               OR addresses.lastname #{LIKE} :search
+                               OR ship_addresses_users.firstname #{LIKE} :search
+                               OR ship_addresses_users.lastname #{LIKE} :search",
+                               {:search => "#{params[:q].strip}%"}).
+                        limit(params[:limit] || 100)
+    end
+  end  
+  
+  def save_user_roles
+    return unless params[:user]
+    return unless @user.respond_to?(:roles) # since roles are technically added by the auth module
+    @user.roles.delete_all
+    params[:user][:role] ||= {}
+    Role.all.each { |role|
+      @user.roles << role unless params[:user][:role][role.name].blank?
+    }
+    params[:user].delete(:role)
+  end
+  
   private
 
   # Allow different formats of json data to suit different ajax calls
@@ -30,35 +58,8 @@ class Admin::UsersController < Admin::BaseController
     end
   end
 
-  def collection
-    return @collection if @collection.present?
-    unless request.xhr?
-      @search = User.registered.metasearch(params[:search])
-      @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
-
-      #scope = scope.conditions "lower(email) = ?", @filter.email.downcase unless @filter.email.blank?
-    else
-      @collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).where("users.email like :search
-                                                                               OR addresses.firstname like :search
-                                                                               OR addresses.lastname like :search
-                                                                               OR ship_addresses_users.firstname like :search
-                                                                               OR ship_addresses_users.lastname like :search",
-                                                                               {:search => "#{params[:q].strip}%"}).limit(params[:limit] || 100)
-    end
-  end
-
   def load_roles
     @roles = Role.all
   end
 
-  def save_user_roles
-    return unless params[:user]
-    return unless @user.respond_to?(:roles) # since roles are technically added by the auth module
-    @user.roles.delete_all
-    params[:user][:role] ||= {}
-    Role.all.each { |role|
-      @user.roles << role unless params[:user][:role][role.name].blank?
-    }
-    params[:user].delete(:role)
-  end
 end

data/app/controllers/admin/variants_controller.rb

@@ -1,23 +1,7 @@
-class Admin::VariantsController < Admin::BaseController
-  resource_controller
-  belongs_to :product
-
-  new_action.response do |wants|
-    wants.html {render :action => :new, :layout => !request.xhr?}
-  end
-
+class Admin::VariantsController < Admin::ResourceController
+  belongs_to :product, :find_by => :permalink
   create.before :create_before
 
-  # redirect to index (instead of r_c default of show view)
-  create.response do |wants|
-    wants.html {redirect_to collection_url}
-  end
-
-  # redirect to index (instead of r_c default of show view)
-  update.response do |wants|
-    wants.html {redirect_to collection_url}
-  end
-
   # override the destory method to set deleted_at value
   # instead of actually deleting the product.
   def destroy
@@ -47,7 +31,7 @@ class Admin::VariantsController < Admin::BaseController
     end
   end
 
-  private
+  protected
   def create_before
     option_values = params[:new_variant]
     option_values.each_value {|id| @object.option_values << OptionValue.find(id)}
@@ -55,12 +39,13 @@ class Admin::VariantsController < Admin::BaseController
   end
 
   def collection
-    @deleted =  (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
+    @deleted = (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
 
     if @deleted.blank?
-      @collection ||= end_of_association_chain
+      @collection ||= super
     else
-      @collection ||= Variant.where(:product_id => @product.id).deleted
+      @collection ||= Variant.where(:product_id => parent.id).deleted
     end
+    @collection
   end
 end

data/app/controllers/admin/zones_controller.rb

@@ -1,35 +1,22 @@
-class Admin::ZonesController < Admin::BaseController
-  resource_controller
-
-  before_filter :load_data
-
-  create.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-
-  update.response do |wants|
-    wants.html { redirect_to collection_url }
-  end
-
-  destroy.success.wants.js { render_js_for_destroy }
-
-  private
-  def build_object
-    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
-    @object.zone_members.build() if @object.zone_members.empty?
-    @object
+class Admin::ZonesController < Admin::ResourceController
+  before_filter :load_data, :except => [:index]
+  
+  def new
+    @zone.zone_members.build
   end
+  
+  protected
 
   def collection
     params[:search] ||= {}
     params[:search][:meta_sort] ||= "ascend_by_name"
-    @search = end_of_association_chain.metasearch(params[:search])
-    @collection = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
+    @search = super.metasearch(params[:search])
+    @zones = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
   end
 
   def load_data
-    @countries = Country.all.sort
-    @states = State.all.sort
-    @zones = Zone.all.sort
+    @countries = Country.order(:name)
+    @states = State.order(:name)
+    @zones = Zone.order(:name)
   end
 end

data/app/controllers/checkout_controller.rb

@@ -64,8 +64,8 @@ class CheckoutController < Spree::BaseController
   end
 
   def before_address
-    @order.bill_address ||= Address.new(:country_id => default_country_id)
-    @order.ship_address ||= Address.new(:country_id => default_country_id)
+    @order.bill_address ||= Address.default
+    @order.ship_address ||= Address.default
   end
 
   def before_delivery
@@ -81,10 +81,6 @@ class CheckoutController < Spree::BaseController
     session[:order_id] = nil
   end
 
-  def default_country_id
-    Spree::Config[:default_country_id]
-  end
-
   def rescue_from_spree_gateway_error
     flash[:error] = t('spree_gateway_error_flash_for_checkout')
     render :edit