jro_apps/redmine Commit - r14138:a19f6fb5003c

Reverts r14510 (#20508) and r14511 (#20507), tests broken....

Jean-Philippe Lang -

r14138:a19f6fb5003c

parent child

Context file:

r14138:a19f6fb5003c

Collapse all files

lib/redmine/hook.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2015  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.
             module Redmine
               module Hook
                 @@listener_classes = []
                 @@listeners = nil
                 @@hook_listeners = {}
                 class << self
                   # Adds a listener class.
                   # Automatically called when a class inherits from Redmine::Hook::Listener.
                   def add_listener(klass)
                     raise "Hooks must include Singleton module." unless klass.included_modules.include?(Singleton)
                     @@listener_classes << klass
                     clear_listeners_instances
                   end
                   # Returns all the listener instances.
                   def listeners
                     @@listeners ||= @@listener_classes.collect {|listener| listener.instance}
                   end
                   # Returns the listener instances for the given hook.
                   def hook_listeners(hook)
                     @@hook_listeners[hook] ||= listeners.select {|listener| listener.respond_to?(hook)}
                   end
                   # Clears all the listeners.
                   def clear_listeners
                     @@listener_classes = []
                     clear_listeners_instances
                   end
                   # Clears all the listeners instances.
                   def clear_listeners_instances
                     @@listeners = nil
                     @@hook_listeners = {}
                   end
                   # Calls a hook.
                   # Returns the listeners response.
                   def call_hook(hook, context={})
                     [].tap do |response|
                       hls = hook_listeners(hook)
                       if hls.any?
                         hls.each {|listener| response << listener.send(hook, context)}
                       end
                     end
                   end
                 end
                 # Base class for hook listeners.
                 class Listener
                   include Singleton
                   include Redmine::I18n
                   # Registers the listener
                   def self.inherited(child)
                     Redmine::Hook.add_listener(child)
                     super
                   end
                 end
                 # Listener class used for views hooks.
                 # Listeners that inherit this class will include various helpers by default.
                 class ViewListener < Listener
                   include ERB::Util
                   include ActionView::Helpers::TagHelper
                   include ActionView::Helpers::FormHelper
                   include ActionView::Helpers::FormTagHelper
                   include ActionView::Helpers::FormOptionsHelper
                   include ActionView::Helpers::JavaScriptHelper
                   include ActionView::Helpers::NumberHelper
                   include ActionView::Helpers::UrlHelper
                   include ActionView::Helpers::AssetTagHelper
                   include ActionView::Helpers::TextHelper
                   include Rails.application.routes.url_helpers
                   include ApplicationHelper
                   # Default to creating links using only the path.  Subclasses can
                   # change this default as needed
                   def self.default_url_options
                     {:only_path => true, :script_name => Redmine::Utils.relative_url_root}
                   end
                   # Helper method to directly render using the context,
                   # render_options must be valid #render options.
                   #
                   #   class MyHook < Redmine::Hook::ViewListener
                   #     render_on :view_issues_show_details_bottom, :partial => "show_more_data"
                   #   end
                   #
                   #   class MultipleHook < Redmine::Hook::ViewListener
                   #     render_on :view_issues_show_details_bottom,
                   #       {:partial => "show_more_data"},
                   #       {:partial => "show_even_more_data"}
                   #   end
                   #
                   def self.render_on(hook, *render_options)
                     define_method hook do |context|
                       render_options.map do |options|
                         if context[:hook_caller].respond_to?(:render)
                           context[:hook_caller].send(:render, {:locals => context}.merge(options))
                         elsif context[:controller].is_a?(ActionController::Base)
                           context[:controller].send(:render_to_string, {:locals => context}.merge(options))
                         else
                           raise "Cannot render #{self.name} hook from #{context[:hook_caller].class.name}"
                         end
                       end
                     end
                   end
                   def controller
                     nil
                   end
                   def config
                     ActionController::Base.config
                   end
                 end
                 # Helper module included in ApplicationHelper and ActionController so that
                 # hooks can be called in views like this:
                 #
                 #   <%= call_hook(:some_hook) %>
                 #   <%= call_hook(:another_hook, :foo => 'bar') %>
                 #
                 # Or in controllers like:
                 #   call_hook(:some_hook)
                 #   call_hook(:another_hook, :foo => 'bar')
                 #
                 # Hooks added to views will be concatenated into a string. Hooks added to
                 # controllers will return an array of results.
                 #
                 # Several objects are automatically added to the call context:
                 #
                 # * project => current project
                 # * request => Request instance
                 # * controller => current Controller instance
                 # * hook_caller => object that called the hook
                 #
                 module Helper
                   def call_hook(hook, context={})
                     if is_a?(ActionController::Base)
                       default_context = {:controller => self, :project => @project, :request => request, :hook_caller => self}
                       Redmine::Hook.call_hook(hook, default_context.merge(context))
                     else
                       default_context = { :project => @project, :hook_caller => self }
                       default_context[:controller] = controller if respond_to?(:controller)
                       default_context[:request] = request if respond_to?(:request)
                       Redmine::Hook.call_hook(hook, default_context.merge(context)).join(' ').html_safe
                     end
                   end
                 end
               end
             end
-            ActionView::Base.send(:include, Redmine::Hook::Helper)
+            ApplicationHelper.send(:include, Redmine::Hook::Helper)
             ActionController::Base.send(:include, Redmine::Hook::Helper)

lib/redmine/themes.rb +1 -2

             # Redmine - project management software
             # Copyright (C) 2006-2015  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.
             module Redmine
               module Themes
                 # Return an array of installed themes
                 def self.themes
                   @@installed_themes ||= scan_themes
                 end
                 # Rescan themes directory
                 def self.rescan
                   @@installed_themes = scan_themes
                 end
                 # Return theme for given id, or nil if it's not found
                 def self.theme(id, options={})
                   return nil if id.blank?
                   found = themes.find {|t| t.id == id}
                   if found.nil? && options[:rescan] != false
                     rescan
                     found = theme(id, :rescan => false)
                   end
                   found
                 end
                 # Class used to represent a theme
                 class Theme
                   attr_reader :path, :name, :dir
                   def initialize(path)
                     @path = path
                     @dir = File.basename(path)
                     @name = @dir.humanize
                     @stylesheets = nil
                     @javascripts = nil
                   end
                   # Directory name used as the theme id
                   def id; dir end
                   def ==(theme)
                     theme.is_a?(Theme) && theme.dir == dir
                   end
                   def <=>(theme)
                     name <=> theme.name
                   end
                   def stylesheets
                     @stylesheets ||= assets("stylesheets", "css")
                   end
                   def images
                     @images ||= assets("images")
                   end
                   def javascripts
                     @javascripts ||= assets("javascripts", "js")
                   end
                   def favicons
                     @favicons ||= assets("favicon")
                   end
                   def favicon
                     favicons.first
                   end
                   def favicon?
                     favicon.present?
                   end
                   def stylesheet_path(source)
                     "/themes/#{dir}/stylesheets/#{source}"
                   end
                   def image_path(source)
                     "/themes/#{dir}/images/#{source}"
                   end
                   def javascript_path(source)
                     "/themes/#{dir}/javascripts/#{source}"
                   end
                   def favicon_path
                     "/themes/#{dir}/favicon/#{favicon}"
                   end
                   private
                   def assets(dir, ext=nil)
                     if ext
                       Dir.glob("#{path}/#{dir}/*.#{ext}").collect {|f| File.basename(f).gsub(/\.#{ext}$/, '')}
                     else
                       Dir.glob("#{path}/#{dir}/*").collect {|f| File.basename(f)}
                     end
                   end
                 end
                 private
                 def self.scan_themes
                   dirs = Dir.glob("#{Rails.public_path}/themes/*").select do |f|
                     # A theme should at least override application.css
                     File.directory?(f) && File.exist?("#{f}/stylesheets/application.css")
                   end
                   dirs.collect {|dir| Theme.new(dir)}.sort
                 end
               end
             end
-            module ThemesHelper
+            module ApplicationHelper
               def current_theme
                 unless instance_variable_defined?(:@current_theme)
                   @current_theme = Redmine::Themes.theme(Setting.ui_theme)
                 end
                 @current_theme
               end
               # Returns the header tags for the current theme
               def heads_for_theme
                 if current_theme && current_theme.javascripts.include?('theme')
                   javascript_include_tag current_theme.javascript_path('theme')
                 end
               end
             end
-            ActionView::Base.send(:include, ThemesHelper)

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