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

Feature Request: Linking Issues and DMSF Documents type: enhancement

Browse Source 
#48
This commit is contained in:
Karel Picman 2017-02-16 12:04:39 +01:00
parent d11b56c3e9
commit 56820af263
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -25,8 +25,10 @@ Changelog for Redmine DMSF
* Bug: #663 - Locked documnts on My page * Bug: #663 - Locked documnts on My page
* Bug: #662 - Broken paging on the Add approver form * Bug: #662 - Broken paging on the Add approver form
* New: #655 - ERROR: Couldn't find Project with identifier=desktop.ini * New: #655 - ERROR: Couldn't find Project with identifier=desktop.ini
* New: #654 - Non-versioned files should not go to trash bin when deleted
* Bug: #652 - Missing date picker when creating new file * Bug: #652 - Missing date picker when creating new file
* Bug: #651 - Incomplete copy of a file to another project * Bug: #651 - Incomplete copy of a file to another project
* New: #648 - Lock duration
* New: #641 - Documents export * New: #641 - Documents export
* New: #635 - Edit approval workflow steps * New: #635 - Edit approval workflow steps
* Bug: #632 - database migration error (from ver 0.9.1 to ver 1.5.8) * Bug: #632 - database migration error (from ver 0.9.1 to ver 1.5.8)

5
app/models/dmsf_file.rb
View File

@ -331,9 +331,8 @@ class DmsfFile < ActiveRecord::Base
project_conditions << Project.allowed_to_condition(user, :view_dmsf_files) project_conditions << Project.allowed_to_condition(user, :view_dmsf_files)
project_conditions << "#{DmsfFile.table_name}.project_id IN (#{project_ids.join(',')})" if project_ids.present? project_conditions << "#{DmsfFile.table_name}.project_id IN (#{project_ids.join(',')})" if project_ids.present?
results = [] scope = self.visible.joins(:dmsf_file_revisions).joins(
"JOIN projects ON dmsf_files.container_id = projects.id AND dmsf_files.container_type = 'Project'")
scope = self.visible.joins(:project, :dmsf_file_revisions)
scope = scope.limit(options[:limit]) unless options[:limit].blank? scope = scope.limit(options[:limit]) unless options[:limit].blank?
scope = scope.where(limit_options) unless limit_options.blank? scope = scope.where(limit_options) unless limit_options.blank?
scope = scope.where(project_conditions.join(' AND ')) scope = scope.where(project_conditions.join(' AND '))