From 7ef777b5bf2d19283c39568799cfb29e8ea85119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Thu, 1 Oct 2015 08:56:31 +0200
Subject: [PATCH]  Rename folder over webdav #109

---
 app/models/dmsf_folder.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 61bc24e8..6f9af758 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -70,7 +70,8 @@ class DmsfFolder < ActiveRecord::Base
           :author => Proc.new {|o| o.user }
 
   validates :title, :presence => true
-  validates_uniqueness_of :title, :scope => [:dmsf_folder_id, :project_id, :deleted]
+  validates_uniqueness_of :title, :scope => [:dmsf_folder_id, :project_id, :deleted], 
+    conditions: -> { where.not(deleted: true) }
   validates_format_of :title, :with => @@invalid_characters,
     :message => l(:error_contains_invalid_character)
   validate :check_cycle