* fixed: Issue 161: Moving a file into the same folder

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@250 5e329b0b-a2ee-ea63-e329-299493fc886d

app/controllers/dmsf_files_copy_controller.rb

@@ -52,6 +52,13 @@ class DmsfFilesCopyController < ApplicationController
       raise DmsfAccessError, l(:error_entry_project_does_not_match_current_project) 
     end
 
+    if (!@target_folder.nil? && @target_folder == @file.folder) || 
+        (@target_folder.nil? && @file.folder.nil? && @target_project == @file.project)
+      flash[:error] = l(:error_target_folder_same)
+      redirect_to :action => "new", :id => @file, :target_project_id => @target_project, :target_folder_id => @target_folder
+      return
+    end
+
     name = @file.name
     
     file = DmsfFile.find_file_by_name(@target_project, @target_folder, name)
@@ -118,6 +125,13 @@ class DmsfFilesCopyController < ApplicationController
       raise DmsfAccessError, l(:error_entry_project_does_not_match_current_project) 
     end
 
+    if (!@target_folder.nil? && @target_folder == @file.folder) || 
+        (@target_folder.nil? && @file.folder.nil? && @target_project == @file.project)
+      flash[:error] = l(:error_target_folder_same)
+      redirect_to :action => "new", :id => @file, :target_project_id => @target_project, :target_folder_id => @target_folder
+      return
+    end
+
     if @file.locked_for_user?
       flash[:error] = l(:error_file_is_locked)
       redirect_to :action => "new", :id => @file, :target_project_id => @target_project, :target_folder_id => @target_folder

config/locales/cs.yml

@@ -175,4 +175,5 @@ cs:
   :title_copy_or_move: "Kopírovat/Přesunout"
   :label_dmsf_folder_plural: "Dmsf složky"
   :comment_moved_from: "Přesunuto z %{source}"
+  :error_target_folder_same: "Cílový adresář a projekt jsou stejné jako aktuální"
   

config/locales/de.yml

@@ -176,4 +176,5 @@ de:
   :title_copy_or_move: "Copy/Move"
   :label_dmsf_folder_plural: "Dmsf folders"
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"
   

config/locales/en-GB.yml

@@ -171,4 +171,5 @@ en-GB:
   :title_copy_or_move: "Copy/Move"
   :label_dmsf_folder_plural: "Dmsf folders"
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"
   

config/locales/en-IS.yml

@@ -171,4 +171,5 @@ en-GB:
   :title_copy_or_move: "Copy/Move"
   :label_dmsf_folder_plural: "Dmsf folders"
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"
   

config/locales/en.yml

@@ -174,6 +174,6 @@ en:
   :label_target_folder: "Target folder"
   :title_copy_or_move: "Copy/Move"
   :label_dmsf_folder_plural: "Dmsf folders"
-  
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"
   

config/locales/es.yml

@@ -173,4 +173,5 @@ es:
   :title_copy_or_move: "Copy/Move"
   :label_dmsf_folder_plural: "Dmsf folders"
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"
   

config/locales/fr.yml

@@ -171,4 +171,5 @@ fr:
   :title_copy_or_move: "Copy/Move"
   :label_dmsf_folder_plural: "Dmsf folders"
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"
   

config/locales/ja.yml

@@ -176,4 +176,5 @@ ja:
   
 #Not translated
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"
   

config/locales/ru.yml

@@ -177,4 +177,5 @@ ru:
 
 #Not translated
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"
   

config/locales/zh.yml

@@ -178,4 +178,5 @@ zh:
   :title_copy_or_move: "Copy/Move"
   :label_dmsf_folder_plural: "Dmsf folders"
   :comment_moved_from: "Moved from %{source}"
+  :error_target_folder_same: "Target folder and project are the same as current"