app/controllers/admin/resource_controller.rb in spree_essentials-0.1.3 vs app/controllers/admin/resource_controller.rb in spree_essentials-0.1.4
- old
+ new
@@ -4,10 +4,16 @@
before_filter :load_resource
respond_to :html
respond_to :js, :except => [:show, :index]
+ def flash_message_for(object, event_sym)
+ resource_desc = object.class.model_name.human
+ resource_desc += " \"#{object.name}\"" if object.respond_to?(:name)
+ I18n.t(event_sym, :resource => resource_desc)
+ end
+
def new
respond_with(@object) do |format|
format.html { render :layout => !request.xhr? }
format.js { render :layout => false }
end
@@ -22,13 +28,11 @@
def update
invoke_callbacks(:update, :before)
if @object.update_attributes(params[object_name])
invoke_callbacks(:update, :after)
- resource_desc = translated_object_name
- resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
- flash[:notice] = I18n.t(:successfully_updated, :resource => resource_desc)
+ flash[:notice] = flash_message_for(@object, :successfully_updated)
respond_with(@object) do |format|
format.html { redirect_to location_after_save }
format.js { render :layout => false }
end
else
@@ -39,13 +43,11 @@
def create
invoke_callbacks(:create, :before)
if @object.save
invoke_callbacks(:create, :after)
- resource_desc = translated_object_name
- resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
- flash[:notice] = I18n.t(:successfully_created, :resource => resource_desc)
+ flash[:notice] = flash_message_for(@object, :successfully_created)
respond_with(@object) do |format|
format.html { redirect_to location_after_save }
format.js { render :layout => false }
end
else
@@ -56,13 +58,11 @@
def destroy
invoke_callbacks(:destroy, :before)
if @object.destroy
invoke_callbacks(:destroy, :after)
- resource_desc = translated_object_name
- resource_desc += " \"#{@object.name}\"" if @object.respond_to?(:name)
- flash[:notice] = I18n.t(:successfully_removed, :resource => resource_desc)
+ flash[:notice] = flash_message_for(@object, :successfully_removed)
respond_with(@object) do |format|
format.html { redirect_to collection_url }
format.js { render :partial => "/admin/shared/destroy" }
end
else
@@ -102,13 +102,9 @@
end
end
def model_class
controller_name.classify.constantize
- end
-
- def translated_object_name
- I18n.t(object_name)
end
def object_name
controller_name.singularize
end