Changeset 14

Show
Ignore:
Timestamp:
08/30/2006 01:12:13 AM (2 years ago)
Author:
matthew
Message:

Display a more useful error message if the site info hasn't been
configured (fixes #11)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/auto-admin/lib/auto_admin_configuration.rb

    r13 r14  
    2020  def self.controller_includes; theme.respond_to?( :controller_includes ) ? [theme.controller_includes].flatten : []; end 
    2121 
     22  Site = Struct.new(:url, :short_url, :name) 
    2223  def self.set_site_info full_url, site_name, admin_site_title='Site Administration' 
    23     ::AutoAdminHelper.site = ::AutoAdminHelper::Site.new full_url, site_name, admin_site_title 
    24   end 
     24    self.site = Site.new(full_url, site_name, admin_site_title) 
     25  end 
     26  def self.site; @@site ||= raise("AutoAdmin not configured: site info not set"); end 
     27  def self.site= new_value; @@site = new_value; end 
    2528  def self.primary_objects; @@primary_objects ||= []; end 
    2629  def self.primary_objects= new_value; @@primary_objects = new_value; end 

  • trunk/auto-admin/lib/auto_admin_helper.rb

    r5 r14  
    1414 
    1515 
    16   class Site 
    17     attr_accessor :url, :short_url, :name 
    18     def initialize *args; @url, @short_url, @name = *args; end 
    19   end 
    2016  def site 
    21     AutoAdminHelper.site 
    22   end 
    23   class << self 
    24     attr_accessor :site 
     17    AutoAdmin::AutoAdminConfiguration.site 
    2518  end 
    2619  def user