jro_apps/redmine Commit - r1173:d8c97b32dd3c

Fixes #780: Redmine fails to start with a const_missing error on Redmine::MenuManager::MenuItem::GLoc (occurs when a Redmine plugin is loaded before GLoc)....

Jean-Philippe Lang -

r1173:d8c97b32dd3c

parent child

Context file:

r1173:d8c97b32dd3c

Collapse all files

config/environment.rb +1 -1

             # Be sure to restart your web server when you modify this file.
             # Uncomment below to force Rails into production mode when
             # you don't control web/app server and can't set it the proper way
             # ENV['RAILS_ENV'] ||= 'production'
             # Bootstrap the Rails environment, frameworks, and default configuration
             require File.join(File.dirname(__FILE__), 'boot')
             Rails::Initializer.run do |config|
               # Settings in config/environments/* take precedence those specified here
               # Skip frameworks you're not going to use
               # config.frameworks -= [ :action_web_service, :action_mailer ]
               # Add additional load paths for sweepers
               config.load_paths += %W( #{RAILS_ROOT}/app/sweepers )
               # Force all environments to use the same logger level
               # (by default production uses :info, the others :debug)
               # config.log_level = :debug
               # Use the database for sessions instead of the file system
               # (create the session table with 'rake create_sessions_table')
               # config.action_controller.session_store = :active_record_store
               config.action_controller.session_store = :PStore
               # Enable page/fragment caching by setting a file-based store
               # (remember to create the caching directory and make it readable to the application)
               # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
               # Activate observers that should always be running
               # config.active_record.observers = :cacher, :garbage_collector
               config.active_record.observers = :message_observer
               # Make Active Record use UTC-base instead of local time
               # config.active_record.default_timezone = :utc
               # Use Active Record's schema dumper instead of SQL when creating the test database
               # (enables use of different database adapters for development and test environments)
               # config.active_record.schema_format = :ruby
               # See Rails::Configuration for more options
             	# SMTP server configuration
             	config.action_mailer.smtp_settings = {
             		:address => "127.0.0.1",
             		:port => 25,
             		:domain => "somenet.foo",
             		:authentication => :login,
-            		:user_name => "redmine",
+            		:user_name => "redmine@somenet.foo",
             		:password => "redmine",
             	}
             	config.action_mailer.perform_deliveries = true
             	# Tell ActionMailer not to deliver emails to the real world.
             	# The :test delivery method accumulates sent emails in the
             	# ActionMailer::Base.deliveries array.
             	#config.action_mailer.delivery_method = :test
             	config.action_mailer.delivery_method = :smtp
             end
             ActiveRecord::Errors.default_error_messages = {
               :inclusion => "activerecord_error_inclusion",
               :exclusion => "activerecord_error_exclusion",
               :invalid => "activerecord_error_invalid",
               :confirmation => "activerecord_error_confirmation",
               :accepted  => "activerecord_error_accepted",
               :empty => "activerecord_error_empty",
               :blank => "activerecord_error_blank",
               :too_long => "activerecord_error_too_long",
               :too_short => "activerecord_error_too_short",
               :wrong_length => "activerecord_error_wrong_length",
               :taken => "activerecord_error_taken",
               :not_a_number => "activerecord_error_not_a_number"
             }
             ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
             Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
             Mime::Type.register 'application/pdf', :pdf
             GLoc.set_config :default_language => :en
             GLoc.clear_strings
             GLoc.set_kcode
             GLoc.load_localized_strings
             GLoc.set_config(:raise_string_not_found_errors => false)
             require 'redmine'

lib/redmine/menu_manager.rb +2 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+            require 'gloc'
             module Redmine
               module MenuManager
                 module MenuController
                   def self.included(base)
                     base.extend(ClassMethods)
                   end
                   module ClassMethods
                     @@menu_items = Hash.new {|hash, key| hash[key] = {:default => key, :actions => {}}}
                     mattr_accessor :menu_items
                     # Set the menu item name for a controller or specific actions
                     # Examples:
                     #   * menu_item :tickets # => sets the menu name to :tickets for the whole controller
                     #   * menu_item :tickets, :only => :list # => sets the menu name to :tickets for the 'list' action only
                     #   * menu_item :tickets, :only => [:list, :show] # => sets the menu name to :tickets for 2 actions only
                     #
                     # The default menu item name for a controller is controller_name by default
                     # Eg. the default menu item name for ProjectsController is :projects
                     def menu_item(id, options = {})
                       if actions = options[:only]
                         actions = [] << actions unless actions.is_a?(Array)
                         actions.each {|a| menu_items[controller_name.to_sym][:actions][a.to_sym] = id}
                       else
                         menu_items[controller_name.to_sym][:default] = id
                       end
                     end
                   end
                   def menu_items
                     self.class.menu_items
                   end
                   # Returns the menu item name according to the current action
                   def current_menu_item
                     menu_items[controller_name.to_sym][:actions][action_name.to_sym] ||
                       menu_items[controller_name.to_sym][:default]
                   end
                 end
                 module MenuHelper
                   # Returns the current menu item name
                   def current_menu_item
                     @controller.current_menu_item
                   end
                   # Renders the application main menu
                   def render_main_menu(project)
                     render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
                   end
                   def render_menu(menu, project=nil)
                     links = []
                     Redmine::MenuManager.allowed_items(menu, User.current, project).each do |item|
                       unless item.condition && !item.condition.call(project)
                         url = case item.url
                         when Hash
                           project.nil? ? item.url : {item.param => project}.merge(item.url)
                         when Symbol
                           send(item.url)
                         else
                           item.url
                         end
                         #url = (project && item.url.is_a?(Hash)) ? {item.param => project}.merge(item.url) : (item.url.is_a?(Symbol) ? send(item.url) : item.url)
                         links << content_tag('li',
                           link_to(l(item.caption), url, (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
                       end
                     end
                     links.empty? ? nil : content_tag('ul', links.join("\n"))
                   end
                 end
                 class << self
                   def map(menu_name)
                     mapper = Mapper.new
                     yield mapper
                     @items ||= {}
                     @items[menu_name.to_sym] ||= []
                     @items[menu_name.to_sym] += mapper.items
                   end
                   def items(menu_name)
                     @items[menu_name.to_sym] || []
                   end
                   def allowed_items(menu_name, user, project)
                     project ? items(menu_name).select {|item| user && user.allowed_to?(item.url, project)} : items(menu_name)
                   end
                 end
                 class Mapper
                   # Adds an item at the end of the menu. Available options:
                   # * param: the parameter name that is used for the project id (default is :id)
                   # * if: a proc that is called before rendering the item, the item is displayed only if it returns true
                   # * caption: the localized string key that is used as the item label
                   # * html_options: a hash of html options that are passed to link_to
                   def push(name, url, options={})
                     items << MenuItem.new(name, url, options)
                   end
                   def items
                     @items ||= []
                   end
                 end
                 class MenuItem
                   include GLoc
                   attr_reader :name, :url, :param, :condition, :html_options
                   def initialize(name, url, options)
                     raise "Invalid option :if for menu item '#{name}'" if options[:if] && !options[:if].respond_to?(:call)
                     raise "Invalid option :html for menu item '#{name}'" if options[:html] && !options[:html].is_a?(Hash)
                     @name = name
                     @url = url
                     @condition = options[:if]
                     @param = options[:param] || :id
                     @caption_key = options[:caption]
                     @html_options = options[:html] || {}
                   end
                   def caption
                     # check if localized string exists on first render (after GLoc strings are loaded)
                     @caption ||= (@caption_key || (l_has_string?("label_#{@name}".to_sym) ? "label_#{@name}".to_sym : @name.to_s.humanize))
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages