diff options
author | Go MAEDA <maeda@farend.jp> | 2018-10-04 13:20:11 +0000 |
---|---|---|
committer | Go MAEDA <maeda@farend.jp> | 2018-10-04 13:20:11 +0000 |
commit | dcc7ecb34a61d55193572ca8bc66c9859f3d6e49 (patch) | |
tree | 8f6e5c9e422a9c4fc2e2a7c46bfd054e54e2441c /app | |
parent | 28c231473f98a4b184204dd53cbeee1e0d655853 (diff) | |
download | redmine-dcc7ecb34a61d55193572ca8bc66c9859f3d6e49.tar.gz redmine-dcc7ecb34a61d55193572ca8bc66c9859f3d6e49.zip |
Attachments prev/next navigation (#29395).
Patch by Jens Krämer.
git-svn-id: http://svn.redmine.org/redmine/trunk@17567 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/attachments_controller.rb | 8 | ||||
-rw-r--r-- | app/helpers/attachments_helper.rb | 8 | ||||
-rw-r--r-- | app/views/layouts/_file.html.erb | 4 |
3 files changed, 20 insertions, 0 deletions
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 1b18662ad..9c0bf15ba 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -32,6 +32,14 @@ class AttachmentsController < ApplicationController def show respond_to do |format| format.html { + if @attachment.container.respond_to?(:attachments) + @attachments = @attachment.container.attachments.to_a + if index = @attachments.index(@attachment) + @paginator = Redmine::Pagination::Paginator.new( + @attachments.size, 1, index+1 + ) + end + end if @attachment.is_diff? @diff = File.read(@attachment.diskfile, :mode => "rb") @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline' diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index 36cf0d4fe..385f3b8a4 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -56,6 +56,14 @@ module AttachmentsHelper end end + def render_pagination + pagination_links_each @paginator do |text, parameters, options| + if att = @attachments[parameters[:page] - 1] + link_to text, named_attachment_path(att, att.filename) + end + end if @paginator + end + def render_api_attachment(attachment, api, options={}) api.attachment do render_api_attachment_attributes(attachment, api) diff --git a/app/views/layouts/_file.html.erb b/app/views/layouts/_file.html.erb index 3b225508b..8ffadf703 100644 --- a/app/views/layouts/_file.html.erb +++ b/app/views/layouts/_file.html.erb @@ -12,6 +12,10 @@ </div> <%= yield %> +<span class="pagination"> + <%= render_pagination %> +</span> + <% html_title @attachment.filename %> <% content_for :header_tags do -%> |