diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-01-25 09:04:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-01-25 09:04:52 +0000 |
| commit | 7a0432d85c01e36564f80d598e1d43dad148875a (patch) | |
| tree | 7ce0df3b8f188225fff680e964dd3b6e0a9f209a /app/helpers | |
| parent | 3a7847c785e34ffef0479a1f07268bf059088878 (diff) | |
| download | redmine-7a0432d85c01e36564f80d598e1d43dad148875a.tar.gz redmine-7a0432d85c01e36564f80d598e1d43dad148875a.zip | |
Adds support for macro and Redmine links in PDF export (#13051).
git-svn-id: http://svn.redmine.org/redmine/trunk@13944 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/issues_helper.rb | 1 | ||||
| -rw-r--r-- | app/helpers/wiki_helper.rb | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 53b9037bd..db10ed604 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -622,6 +622,8 @@ module ApplicationHelper end def parse_inline_attachments(text, project, obj, attr, only_path, options) + return if options[:inline_attachments] == false + # when using an image link, try to use an attachment, if possible attachments = options[:attachments] || [] attachments += obj.attachments if obj.respond_to?(:attachments) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 5706bf53d..da9995345 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -19,6 +19,7 @@ module IssuesHelper include ApplicationHelper + include Redmine::Export::PDF::IssuesPdfHelper def issue_list(issues, &block) ancestors = [] diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb index aa1584a44..77ac01835 100644 --- a/app/helpers/wiki_helper.rb +++ b/app/helpers/wiki_helper.rb @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module WikiHelper + include Redmine::Export::PDF::WikiPdfHelper def wiki_page_options_for_select(pages, selected = nil, parent = nil, level = 0) pages = pages.group_by(&:parent) unless pages.is_a?(Hash) |