From 90eedcc2dd417b94f1ab017c036f088f9f6f54bd Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Thu, 9 May 2013 16:33:07 +0200
Subject: [PATCH] Wrong parent folder path in folder edit form fixed.

---
 app/views/dmsf/edit.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb
index fbc70a9a..171896ca 100644
--- a/app/views/dmsf/edit.html.erb
+++ b/app/views/dmsf/edit.html.erb
@@ -27,8 +27,9 @@
 				<p>
 					<%= label_tag("", l(:field_folder) + ":") %>
 					<%= f.select(:dmsf_folder_id, 
-						options_for_select(DmsfFolder.directory_tree(@project, @folder), 
-							:selected => @folder.nil? ? (@pathfolder.id unless @pathfolder.nil?) : (@folder.folder.id unless @folder.folder.nil?))) %>
+						options_for_select(DmsfFolder.directory_tree(@project, @folder), 	
+                                                  :selected => @parent? @parent.id : (@pathfolder.id if @pathfolder)))                                                  
+					%>				
 				</p>
 			</div>
 		</div>