locomotive_cms 0.0.2.9 → 0.0.3.1

data/Gemfile

@@ -23,6 +23,7 @@ gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
 gem 'heroku'
 gem 'httparty', '0.6.0'
 gem 'RedCloth'
+gem 'inherited_resources', '1.1.2'
 
 # Development environment
 group :development do

data/app/controllers/admin/accounts_controller.rb

@@ -8,17 +8,11 @@ module Admin
     end
     
     def create
-      @account = Account.new(params[:account])
-
-      if @account.save
-        current_site.memberships.create(:account => @account)
-        flash_success!
-        redirect_to edit_admin_current_site_url
-      else
-        flash_error!
-        render :action => 'new'
-      end
-    end  
+      @account = Account.create(params[:account])
+      current_site.memberships.create(:account => @account) if @account.errors.empty?
+      
+      respond_with @account, :location => edit_admin_current_site_url
+    end
     
   end
 end

data/app/controllers/admin/asset_collections_controller.rb

@@ -4,63 +4,22 @@ module Admin
     sections 'assets'  
     
     before_filter :set_collections
-  
+    
     def index
-      if not @collections.empty?
-        redirect_to(edit_admin_asset_collection_url(@collections.first)) and return
+      if not @asset_collections.empty?
+        redirect_to(edit_admin_asset_collection_url(@asset_collections.first)) and return
       end
     end
   
     def show
-      @collection = current_site.asset_collections.find(params[:id])
+      @asset_collection = current_site.asset_collections.find(params[:id])
       render :action => 'edit'
     end
-
-    def new
-      @collection = current_site.asset_collections.build
-    end
-
-    def edit
-      @collection = current_site.asset_collections.find(params[:id])
-    end
-
-    def create
-      @collection = current_site.asset_collections.build(params[:asset_collection])
-
-      if @collection.save
-        flash_success!
-        redirect_to edit_admin_asset_collection_url(@collection)
-      else
-        flash_error!
-        render :action => 'new'
-      end
-    end
-
-    def update
-      @collection = current_site.asset_collections.find(params[:id])
-
-      if @collection.update_attributes(params[:asset_collection])
-        flash_success!
-        redirect_to edit_admin_asset_collection_url(@collection)
-      else
-        flash_error!
-        render :action => 'edit'
-      end
-    end
-
-    def destroy
-      @collection = current_site.asset_collections.find(params[:id])
-      @collection.destroy
-
-      flash_success!
-
-      redirect_to admin_asset_collections_url
-    end
   
     protected 
   
     def set_collections
-      @collections = current_site.asset_collections.order_by([[:name, :asc]])
+      @asset_collections = current_site.asset_collections.order_by([[:name, :asc]])
     end
   end
 end

data/app/controllers/admin/assets_controller.rb

@@ -5,43 +5,25 @@ module Admin
     
     before_filter :set_collections_and_current_collection
     
-    def new
-      @asset = @collection.assets.build
-    end
-
-    def edit
-      @asset = @collection.assets.find(params[:id])
-    end
-
+    respond_to :json, :only => :update
+    
     def create
-      @asset = @collection.assets.build(params[:asset])
-
-      if @asset.save
-        flash_success!
-        redirect_to edit_admin_asset_collection_url(@collection)
-      else
-        flash_error!
-        render :action => 'new'
-      end
+      create! { edit_admin_asset_collection_url(@asset_collection) }
     end
-
+    
     def update
-      @asset = @collection.assets.find(params[:id])
-
-      if @asset.update_attributes(params[:asset])
-        flash_success!
-        redirect_to edit_admin_asset_collection_url(@collection)
-      else
-        flash_error!
-        render :action => 'edit'
-      end
+      update! { edit_admin_asset_collection_url(@asset_collection) }
     end
-  
+    
     protected 
+    
+    def begin_of_association_chain
+      @asset_collection
+    end
   
     def set_collections_and_current_collection
-      @collections = current_site.asset_collections
-      @collection = @collections.find(params[:collection_id])
+      @asset_collections = current_site.asset_collections
+      @asset_collection = @asset_collections.find(params[:collection_id])
     end
     
   end

data/app/controllers/admin/base_controller.rb

@@ -1,8 +1,8 @@
 module Admin
-  class BaseController < ::ApplicationController
-  
+  class BaseController < InheritedResources::Base
+    
     include Locomotive::Routing::SiteDispatcher
-  
+    
     layout 'admin/application'
     
     before_filter :authenticate_admin!
@@ -14,27 +14,23 @@ module Admin
     before_filter :set_locale
   
     helper_method :sections
-  
+    
     # https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
     Dir[File.dirname(__FILE__) + "/../../helpers/**/*_helper.rb"].each do |file|
       helper "admin/#{File.basename(file, '.rb').gsub(/_helper$/, '')}"
     end
+        
+    self.responder = Locomotive::AdminResponder # custom responder
+    
+    defaults :route_prefix => 'admin'
+    
+    respond_to :html
     
     protected
-  
-    def flash_success!(options = {})
-      msg = translate_flash_msg(:successful)
-      (options.has_key?(:now) && options[:now] ? flash.now : flash)[:success] = msg
-    end
-
-    def flash_error!(options = { :now => true })
-      msg = translate_flash_msg(:failed)
-      (options.has_key?(:now) && options[:now] ? flash.now : flash)[:error] = msg
-    end
-  
-    def translate_flash_msg(kind)
-      t("#{kind.to_s}_#{action_name}", :scope => [:admin, controller_name.underscore.gsub('/', '.'), :messages])
-    end
+    
+    def begin_of_association_chain
+      current_site
+    end    
   
     def self.sections(main, sub = nil)
       before_filter do |c|
@@ -55,6 +51,6 @@ module Admin
     def set_locale
       I18n.locale = current_admin.locale
     end
-  
+      
   end
 end

data/app/controllers/admin/content_types_controller.rb

@@ -2,51 +2,6 @@ module Admin
   class ContentTypesController < BaseController
   
     sections 'contents'
-      
-    def new
-      @content_type = current_site.content_types.build
-    end
-  
-    def edit
-      @content_type = current_site.content_types.find(params[:id])
-    end
-  
-    def create
-      @content_type = current_site.content_types.build(params[:content_type])
-
-      if @content_type.save
-        flash_success!
-        redirect_to edit_admin_content_type_url(@content_type)
-      else
-        flash_error!
-        render :action => 'new'
-      end
-    end
-  
-    def update
-      @content_type = current_site.content_types.find(params[:id])
-      
-      if @content_type.update_attributes(params[:content_type])
-        flash_success!
-        redirect_to edit_admin_content_type_url(@content_type)
-      else
-        flash_error!
-        render :action => "edit"
-      end
-    end
-    
-    def destroy
-      @content_type = current_site.content_types.find(params[:id])
-
-      begin
-        @content_type.destroy
-        flash_success!
-      rescue Exception => e
-        flash[:error] = e.to_s
-      end
-
-      redirect_to admin_pages_url
-    end
-      
+            
   end
 end

data/app/controllers/admin/contents_controller.rb

@@ -3,70 +3,43 @@ module Admin
   
     sections 'contents'
     
-    before_filter :set_content_type    
+    before_filter :set_content_type
+    
+    respond_to :json, :only => :update
   
     def index
       @contents = @content_type.list_or_group_contents
     end
   
-    def new
-      @content = @content_type.contents.build
-    end
-  
-    def edit
-      @content = @content_type.contents.find(params[:id])
-    end
-  
     def create
-      @content = @content_type.contents.build(params[:content_instance])
-
-      if @content.save
-        flash_success!
-        redirect_to edit_admin_content_url(@content_type.slug, @content)
-      else
-        flash_error!
-        render :action => 'new'
+      create! do |success, failure|
+        success.html { redirect_to edit_admin_content_url(@content_type.slug, @content) }
       end
     end
-  
-    def update
-      @content = @content_type.contents.find(params[:id])
       
-      if @content.update_attributes(params[:content_instance])
-        flash_success!
-        redirect_to edit_admin_content_url(@content_type.slug, @content)
-      else
-        flash_error!
-        render :action => "edit"
-      end
+    def update
+      update! { edit_admin_content_url(@content_type.slug, @content) }
     end
     
     def sort
       @content_type.sort_contents!(params[:order])
       
-      flash_success!
-      
-      redirect_to admin_contents_url(@content_type.slug)
+      respond_with(@content_type, :location => admin_contents_url(@content_type.slug))
     end    
-  
+    
     def destroy
-      @content = @content_type.contents.find(params[:id])
-
-      begin
-        @content.destroy
-        flash_success!
-      rescue Exception => e
-        flash[:error] = e.to_s
-      end
-
-      redirect_to admin_contents_url(@content_type.slug)
+      destroy! { admin_contents_url(@content_type.slug) }
     end
   
     protected
   
     def set_content_type
-      @content_type = current_site.content_types.where(:slug => params[:slug]).first
+      @content_type ||= current_site.content_types.where(:slug => params[:slug]).first
     end
+    
+    def begin_of_association_chain
+      set_content_type
+    end    
   
   end
 end

data/app/controllers/admin/current_sites_controller.rb

@@ -2,24 +2,23 @@ module Admin
   class CurrentSitesController < BaseController
   
     sections 'settings', 'site'
-  
-    def edit
-      @site = current_site
-    end
+    
+    actions :edit, :update
+    
+    respond_to :json, :only => :update
     
     def update
-      @site = current_site
-      if @site.update_attributes(params[:site])
-        flash_success!
-        redirect_to edit_admin_current_site_url(new_host_if_subdomain_changed)
-      else
-        flash_error!
-        render :action => :edit
+      update! do |success, failure|
+        success.html { redirect_to edit_admin_current_site_url(new_host_if_subdomain_changed) }
       end
     end
       
     protected
     
+    def resource
+      @site = current_site
+    end
+    
     def new_host_if_subdomain_changed
       if @site.domains.include?(request.host)
         {}

data/app/controllers/admin/custom_fields_controller.rb

@@ -19,7 +19,7 @@ module Admin
       if @field.update_attributes(params[:custom_field])
         render :json => @field.attributes
       else
-        render :json => { :error => translate_flash_msg(:successful) }
+        render :json => { :error => t('flash.admin.custom_fields.update.alert') }
       end
     end
     

data/app/controllers/admin/layouts_controller.rb

@@ -3,55 +3,11 @@ module Admin
   
     sections 'settings'
   
+    respond_to :json, :only => :update
+  
     def index
       @layouts = current_site.layouts.order_by([[:name, :asc]])
     end
-    
-    def new
-      @layout = current_site.layouts.build
-    end
-  
-    def edit
-      @layout = current_site.layouts.find(params[:id])
-    end
-  
-    def create
-      @layout = current_site.layouts.build(params[:layout])
-
-      if @layout.save
-        flash_success!
-        redirect_to edit_admin_layout_url(@layout)
-      else
-        logger.debug "===> #{@layout.errors.inspect}"
-        flash_error!
-        render :action => 'new'
-      end
-    end
-  
-    def update
-      @layout = current_site.layouts.find(params[:id])
-      
-      if @layout.update_attributes(params[:layout])
-        flash_success!
-        redirect_to edit_admin_layout_url(@layout)
-      else
-        flash_error!
-        render :action => "edit"
-      end
-    end
-  
-    def destroy
-      @layout = current_site.layouts.find(params[:id])
-
-      begin
-        @layout.destroy
-        flash_success!
-      rescue Exception => e
-        flash[:error] = e.to_s
-      end
-
-      redirect_to admin_layouts_url
-    end
   
   end
 end