Documents export type: enhancement

#641
This commit is contained in:
Karel Picman 2017-02-27 16:35:49 +01:00
parent 143edf9218
commit c4f8ae364c
3 changed files with 4 additions and 6 deletions

View File

@ -34,7 +34,6 @@ class DmsfController < ApplicationController
skip_before_action :verify_authenticity_token, if: -> { request.headers['HTTP_X_REDMINE_API_KEY'].present? } skip_before_action :verify_authenticity_token, if: -> { request.headers['HTTP_X_REDMINE_API_KEY'].present? }
helper :all helper :all
#helper :dmsf
def expand_folder def expand_folder
@tree_view = true @tree_view = true

View File

@ -584,7 +584,6 @@ class DmsfFile < ActiveRecord::Base
# Url # Url
if columns.include?(l(:label_document_url)) if columns.include?(l(:label_document_url))
default_url_options[:host] = Setting.host_name default_url_options[:host] = Setting.host_name
url = url_for(:controller => :dmsf_files, :action => 'view', :id => self.id)
csv << url_for(:controller => :dmsf_files, :action => 'view', :id => self.id) csv << url_for(:controller => :dmsf_files, :action => 'view', :id => self.id)
end end
# Revision # Revision

View File

@ -154,7 +154,7 @@ class DmsfLink < ActiveRecord::Base
csv = [] csv = []
if self.target_type == 'DmsfUrl' if self.target_type == 'DmsfUrl'
# Id # Id
csv << '' if columns.include?('id') csv << self.id if columns.include?('id')
# Title # Title
csv << self.title.insert(0, ' ' * level) if columns.include?('title') csv << self.title.insert(0, ' ' * level) if columns.include?('title')
# Extension # Extension
@ -168,11 +168,11 @@ class DmsfLink < ActiveRecord::Base
# Workflow # Workflow
csv << '' if columns.include?('workflow') csv << '' if columns.include?('workflow')
# Author # Author
csv << self.last_revision.user.name if columns.include?('author') csv << self.user.name if columns.include?('author')
# Url # Url
csv << self.external_url if columns.include?('url') csv << self.external_url if columns.include?(l(:label_document_url))
# Revision # Revision
csv << '' if columns.include?('revision') csv << '' if columns.include?(l(:label_last_revision_id))
# Custom fields # Custom fields
cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position)
cfs.each do |c| cfs.each do |c|