]> source.dussan.org Git - redmine.git/commitdiff
Prevent blank menu caption.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 13 Jul 2008 13:25:37 +0000 (13:25 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 13 Jul 2008 13:25:37 +0000 (13:25 +0000)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1663 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/redmine/menu_manager.rb

index 11b7a72e87f022862107edb4db577039d461970b..a3dc3ca25370101e3ae879fd41ebd8668a61de31 100644 (file)
@@ -167,7 +167,9 @@ module Redmine
       
       def caption(project=nil)
         if @caption.is_a?(Proc)
-          @caption.call(project)
+          c = @caption.call(project).to_s
+          c = @name.to_s.humanize if c.blank?
+          c
         else
           # check if localized string exists on first render (after GLoc strings are loaded)
           @caption_key ||= (@caption || (l_has_string?("label_#{@name}".to_sym) ? "label_#{@name}".to_sym : @name.to_s.humanize))