Merge branch 'devel-1.5.7' of https://github.com/chris-ibcsf/redmine_dmsf into devel-1.5.7

CHANGELOG.md

@@ -1,6 +1,9 @@
 Changelog for Redmine DMSF
 ==========================
 
+1.5.7 *2015-??-??*
+------------------
+
 1.5.6 *2015-01-25*
 ------------------
 

README.md

@@ -1,7 +1,7 @@
 Redmine DMSF Plugin
 ===================
 
-The current version of Redmine DMSF is **1.5.6** [![Build Status](https://api.travis-ci.org/danmunn/redmine_dmsf.png)](https://travis-ci.org/danmunn/redmine_dmsf)
+The current version of Redmine DMSF is **1.5.7** [![Build Status](https://api.travis-ci.org/danmunn/redmine_dmsf.png)](https://travis-ci.org/danmunn/redmine_dmsf)
 
 Redmine DMSF is Document Management System Features plugin for Redmine issue tracking system; It is aimed to replace current Redmine's Documents module.
 
@@ -192,6 +192,7 @@ Before installing ensure that the Redmine instance is stopped.
 1. In case of upgrade BACKUP YOUR DATABASE first
 2. Put redmine_dmsf plugin directory into plugins.
 3. Install dependencies: `bundle install`.
+3.1 To install dependencies without Xapian (full-text searching): `bundle install --without xapian`. This option might be useful especially in Windows.
 4. Initialize/Update database: `bundle exec rake redmine:plugins:migrate RAILS_ENV="production"`.
 5. The access rights must be set for web server, example: `chown -R www-data:www-data plugins/redmine_dmsf`.
 6. Restart the web server.

app/models/dmsf_file_revision.rb

@@ -3,7 +3,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
-# Copyright (C) 2011-15 Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011-16 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -256,7 +256,8 @@ class DmsfFileRevision < ActiveRecord::Base
     else
       filename = self.name
     end    
-    format.sub!('%t', filename)
+    format.sub!('%t', self.title)
+    format.sub!('%f', filename)
     format.sub!('%d', self.updated_at.strftime('%Y%m%d%H%M%S'))
     format.sub!('%v', self.version)
     format.sub!('%i', self.file.id.to_s)
@@ -264,4 +265,4 @@ class DmsfFileRevision < ActiveRecord::Base
     format + ext
   end
 
-end
+end

config/locales/cs.yml

@@ -109,7 +109,7 @@ cs:
   select_option_deactivated: Deaktivováno
   select_option_activated: Aktivováno
   label_title_format: Formát názvu
-  text_title_format: "Formát názvu souboru pro stažení (%t - název, %d - datum, %v - verze, %i - ID, %r - revize). Např.: %t_%v"
+  text_title_format: "Formát názvu souboru pro stažení (%t - název, %f - soubor, %d - datum, %v - verze, %i - ID, %r - revize). Např.: %t_%v"
   title_save_preferences: Uložit nastavení
   heading_revisions: Revize
   title_download: Stáhnout

config/locales/de.yml

@@ -109,7 +109,7 @@ de:
   select_option_deactivated: Aus
   select_option_activated: Ein
   label_title_format: Title format
-  text_title_format: "Format des Dokumente-Titels für Speichern (%t - Titel, %d - Datum, %v - Version, %i - ID, %r - Revision). z.B.: %t_%v"
+  text_title_format: "Format des Dokumente-Titels für Speichern (%t - Titel, %f - Datei, %d - Datum, %v - Version, %i - ID, %r - Revision). z.B.: %t_%v"
   title_save_preferences: Einstellungen speichern
   heading_revisions: Versionen
   title_download: Download

config/locales/en.yml

@@ -109,7 +109,7 @@ en:
   select_option_deactivated: Deactivated
   select_option_activated: Activated
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Save preferences
   heading_revisions: Revisions
   title_download: Download

config/locales/es.yml

@@ -109,7 +109,7 @@ es:
   select_option_deactivated: Desactivado
   select_option_activated: Activado
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Guardar Preferencias
   heading_revisions: Revisiones
   title_download: Descargar

config/locales/fr.yml

@@ -109,7 +109,7 @@ fr:
   select_option_deactivated: Désactivé
   select_option_activated: Activé
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Enregistrer les préférences
   heading_revisions: Révisions
   title_download: Télécharger

config/locales/ja.yml

@@ -109,7 +109,7 @@ ja:
   select_option_deactivated: 無効
   select_option_activated: 有効
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: 設定を保存します
   heading_revisions: リビジョン
   title_download: ダウンロードします

config/locales/pl.yml

@@ -109,7 +109,7 @@ pl:
   select_option_default: Domyślny
   select_option_deactivated: Wyłączono
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   select_option_activated: Aktywowano
   title_save_preferences: Zapisz ustawienia
   heading_revisions: Wersje

config/locales/pt-BR.yml

@@ -109,7 +109,7 @@ pt-BR:
   select_option_deactivated: Desativado
   select_option_activated: Ativado
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Salvar preferências
   heading_revisions: Revisões
   title_download: Download

config/locales/ru.yml

@@ -109,7 +109,7 @@ ru:
   select_option_deactivated: Отключено
   select_option_activated: Включено
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Сохранить настройки
   heading_revisions: Редакции
   title_download: Скачать

config/locales/sl.yml

@@ -109,7 +109,7 @@ sl:
   select_option_deactivated: Deaktivirano
   select_option_activated: Aktivirano
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Save preferences
   heading_revisions: Verzije
   title_download: Prenesi dol

config/locales/zh-TW.yml

@@ -109,7 +109,7 @@ zh-TW:
   select_option_deactivated: 關閉
   select_option_activated: 啟用
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: 儲存偏好設定
   heading_revisions: 修訂版本
   title_download: 下載

config/locales/zh.yml

@@ -110,7 +110,7 @@ zh:
   select_option_activated: 激活
   title_save_preferences: 保存偏好设定
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   heading_revisions: 修订版本
   title_download: 下载
   title_delete_revision: 删除此修订

db/migrate/20160215125801_approval_workflow_status.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+#
+# Redmine plugin for Document Management System "Features"
+#
+# Copyright (C) 2015 Karel Pičman <karel.picman@kontorn.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class TitleFormat < ActiveRecord::Migration
+  def self.up
+    add_column :members, :title_format, :text, :null => true, :limit => 100
+  end
+
+  def self.down
+    remove_column :members, :title_format        
+  end
+end

init.rb

@@ -28,7 +28,7 @@ Redmine::Plugin.register :redmine_dmsf do
   name 'DMSF'
   author 'Vít Jonáš / Daniel Munn / Karel Pičman'
   description 'Document Management System Features'
-  version '1.5.6'
+  version '1.5.7 devel'
   url 'http://www.redmine.org/plugins/dmsf'
   author_url 'https://github.com/danmunn/redmine_dmsf/graphs/contributors'
   

lib/redmine_dmsf/webdav/dmsf_resource.rb

@@ -49,10 +49,10 @@ module RedmineDmsf
         unless @childern
           @children = []
           if collection?
-            folder.subfolders.visible.map do |p|
+            folder.subfolders.select(:title).visible.map do |p|
               @children.push child(p.title)
             end
-            folder.files.visible.map do |p|
+            folder.files.select(:name).visible.map do |p|
               @children.push child(p.name)
             end
           end

lib/redmine_dmsf/webdav/index_resource.rb

@@ -26,7 +26,8 @@ module RedmineDmsf
       def children
         unless @projects
           @projects = []
-          Project.has_module(:dmsf).where(Project.allowed_to_condition(
+          Project.select(:identifier).has_module(:dmsf).where(
+            Project.allowed_to_condition(
               User.current, :view_dmsf_folders)).order('lft').all.each do |p|
             @projects << child(p.identifier)
           end

lib/redmine_dmsf/webdav/project_resource.rb

@@ -27,10 +27,10 @@ module RedmineDmsf
         unless @children          
           @children = []
           if project
-            project.dmsf_folders.visible.map do |p|
+            project.dmsf_folders.select(:title).visible.map do |p|
               @children.push child(p.title)
             end
-            project.dmsf_files.visible.map do |p|
+            project.dmsf_files.select(:name).visible.map do |p|
               @children.push child(p.name)              
             end
           end