#641 Project column

app/controllers/dmsf_controller.rb

@@ -601,7 +601,7 @@ class DmsfController < ApplicationController
     @file_approval_allowed = User.current.allowed_to?(:file_approval, @project)
     tag = params[:custom_field_id].present? && params[:custom_value].present?
     @folder = nil if tag
-    @extra_columns = [l(:label_document_url), l(:label_last_revision_id)]
+    @extra_columns = [l(:field_project), l(:label_document_url), l(:label_last_revision_id)]
     if @tree_view
       @locked_for_user = false
     else

app/models/dmsf_file.rb

@@ -541,6 +541,8 @@ class DmsfFile < ActiveRecord::Base
 
   def to_csv(columns, level)
     csv = []
+    # Project
+    csv << self.project.name if columns.include?(l(:field_project))
     # Id
     csv << self.id if columns.include?('id')
     # Title

app/models/dmsf_folder.rb

@@ -432,6 +432,8 @@ class DmsfFolder < ActiveRecord::Base
 
   def to_csv(columns, level)
     csv = []
+    # Project
+    csv << self.project.name if columns.include?(l(:field_project))
     # Id
     csv << self.id if columns.include?('id')
     # Title

app/models/dmsf_link.rb

@@ -153,6 +153,8 @@ class DmsfLink < ActiveRecord::Base
   def to_csv(columns, level)
     csv = []
     if self.target_type == 'DmsfUrl'
+      # Project
+      csv << self.project.name if columns.include?(l(:field_project))
       # Id
       csv << self.id if columns.include?('id')
       # Title

app/views/settings/_dmsf_columns.html.erb

@@ -24,6 +24,11 @@
   <%= content_tag(:label, l(:field_column_names)) %>
   <% columns = DmsfFolder::AVAILABLE_COLUMNS.dup %>
   <% columns.concat(extra_columns) if defined?(extra_columns) %>
+  <% index = columns.index(l(:field_project)) %>
+  <%# Move Project to the second position %>
+  <% if index %>
+    <% columns.insert(0, columns.delete_at(index)) %>
+  <% end %>
   <% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
   <% columns.concat(cfs.map{ |c| c.name }) %>
   <% selected_columns = settings[:dmsf_columns] %>