redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrong pagination of document's revisions

Browse Source
This commit is contained in:
karel.picman@lbcfree.net 2020-06-24 13:30:51 +02:00
parent 1c220b7e66
commit 5cf19e85f6
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/dmsf_files_controller.rb
View File

@ -85,7 +85,8 @@ class DmsfFilesController < ApplicationController
@revision = @file.last_revision
@file_delete_allowed = User.current.allowed_to?(:file_delete, @project)
@file_manipulation_allowed = User.current.allowed_to?(:file_manipulation, @project)
@revision_pages = Paginator.new @file.dmsf_file_revisions.visible.count, params['per_page'] ? params['per_page'].to_i : 25, params['page']
@revision_count = @file.dmsf_file_revisions.visible.all.size
@revision_pages = Paginator.new @revision_count, params['per_page'] ? params['per_page'].to_i : 25, params['page']
respond_to do |format|
format.html {

1
app/views/dmsf_files/_revision_access.html.erb
View File

@ -44,4 +44,3 @@
</tbody>
</table>
</div>
<span class="pagination"><%= pagination_links_full revision_access_pages, revision_access_count %></span>

10
app/views/dmsf_files/show.html.erb
View File

@ -158,20 +158,14 @@
<% if @file_manipulation_allowed %>
<% revision_access_query = DmsfFileRevisionAccessQuery.new %>
<% revision_access_query.revision_id = revision.id %>
<% revision_access_count = revision_access_query.access_count %>
<% revision_access_pages = Redmine::Pagination::Paginator.new revision_access_count,
Setting.per_page_options_array.first || 25, params['page'] %>
<%= render partial: 'revision_access', locals: { revision: revision, query: revision_access_query,
revision_access_count: revision_access_count,
revision_access_pages: revision_access_pages } %>
<%= render partial: 'revision_access', locals: { revision: revision, query: revision_access_query } %>
<% end %>
</div>
</div>
</div>
<br/>
<% end %>
<span class="pagination"><%= pagination_links_full @revision_pages, @file.dmsf_file_revisions.visible.count %></span>
<span class="pagination"><%= pagination_links_full @revision_pages, @revision_count %></span>
<%= late_javascript_tag do %>
$('a.delete-revision').click(function(event) {