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

#1080 Revision access

Browse Source
This commit is contained in:
Karel Pičman 2020-03-26 13:46:47 +01:00
parent 5356406710
commit c917421cb2
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/dmsf_files_controller.rb
View File

@ -86,10 +86,10 @@ class DmsfFilesController < ApplicationController
@file_delete_allowed = User.current.allowed_to?(:file_delete, @project) @file_delete_allowed = User.current.allowed_to?(:file_delete, @project)
@file_manipulation_allowed = User.current.allowed_to?(:file_manipulation, @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_pages = Paginator.new @file.dmsf_file_revisions.visible.count, params['per_page'] ? params['per_page'].to_i : 25, params['page']
@revision_access_query = retrieve_query(DmsfFileRevisionAccessQuery, true) #@revision_access_query = retrieve_query(DmsfFileRevisionAccessQuery, false)
@revision_access_query.revision_id = @revision.id # @revision_access_query.revision_id = @revision.id
@revision_access_count = @revision_access_query.access_count # @revision_access_count = @revision_access_query.access_count
@revision_access_pages = Paginator.new @revision_access_count, per_page_option, params['page'] # @revision_access_pages = Paginator.new @revision_access_count, per_page_option, params['page']
respond_to do |format| respond_to do |format|
format.html { format.html {

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

@ -73,12 +73,12 @@
<% if defined?(EasyExtensions) %> <% if defined?(EasyExtensions) %>
<%= render partial: 'dmsf_context_menus/revision_actions', <%= render partial: 'dmsf_context_menus/revision_actions',
locals: { project: @project, file: @file, file_delete_allowed: @file_delete_allowed, locals: { project: @project, file: @file, file_delete_allowed: @file_delete_allowed,
file_manipulation_allowed: @file_manipulation_allowed, revision: @revision } %> file_manipulation_allowed: @file_manipulation_allowed, revision: revision } %>
<% else %> <% else %>
<%= actions_dropdown do %> <%= actions_dropdown do %>
<%= render partial: 'dmsf_context_menus/revision_actions', <%= render partial: 'dmsf_context_menus/revision_actions',
locals: { project: @project, file: @file, file_delete_allowed: @file_delete_allowed, locals: { project: @project, file: @file, file_delete_allowed: @file_delete_allowed,
file_manipulation_allowed: @file_manipulation_allowed, revision: @revision } %> file_manipulation_allowed: @file_manipulation_allowed, revision: revision } %>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
@ -156,9 +156,14 @@
</div> </div>
<div id="<%= "revision_access-#{revision.id}" %>" style="display:none"> <div id="<%= "revision_access-#{revision.id}" %>" style="display:none">
<% if @file_manipulation_allowed %> <% if @file_manipulation_allowed %>
<%= render partial: 'revision_access', locals: { revision: revision, query: @query, <% revision_access_query = DmsfFileRevisionAccessQuery.new %>
revision_access_count: @revision_access_count, <% revision_access_query.revision_id = revision.id %>
revision_access_pages: @revision_access_pages } %> <% 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 } %>
<% end %> <% end %>
</div> </div>
</div> </div>