From 2360af77071c34389e720bc2079cd7bc57e951d5 Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Fri, 7 Oct 2011 08:51:57 +0000 Subject: [PATCH] * 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 | 14 ++++++++++++++ config/locales/cs.yml | 1 + config/locales/de.yml | 1 + config/locales/en-GB.yml | 1 + config/locales/en-IS.yml | 1 + config/locales/en.yml | 2 +- config/locales/es.yml | 1 + config/locales/fr.yml | 1 + config/locales/ja.yml | 1 + config/locales/ru.yml | 1 + config/locales/zh.yml | 1 + 11 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/controllers/dmsf_files_copy_controller.rb b/app/controllers/dmsf_files_copy_controller.rb index a164a684..a4d2e44e 100644 --- a/app/controllers/dmsf_files_copy_controller.rb +++ b/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 diff --git a/config/locales/cs.yml b/config/locales/cs.yml index fb38a7d7..b1cc1bf0 100644 --- a/config/locales/cs.yml +++ b/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í" \ No newline at end of file diff --git a/config/locales/de.yml b/config/locales/de.yml index 9267a464..46b6318c 100644 --- a/config/locales/de.yml +++ b/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" \ No newline at end of file diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index dabc6ad6..9fa08d61 100644 --- a/config/locales/en-GB.yml +++ b/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" \ No newline at end of file diff --git a/config/locales/en-IS.yml b/config/locales/en-IS.yml index dabc6ad6..9fa08d61 100644 --- a/config/locales/en-IS.yml +++ b/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" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 240e9921..8912c89d 100644 --- a/config/locales/en.yml +++ b/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" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 854a43fd..9a0cfc6f 100644 --- a/config/locales/es.yml +++ b/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" \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7980e33f..2d75529c 100644 --- a/config/locales/fr.yml +++ b/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" \ No newline at end of file diff --git a/config/locales/ja.yml b/config/locales/ja.yml index e86faeea..59c72f56 100644 --- a/config/locales/ja.yml +++ b/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" \ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 1571032a..57dd25b6 100644 --- a/config/locales/ru.yml +++ b/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" \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 4437eef6..e05c6b97 100644 --- a/config/locales/zh.yml +++ b/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" \ No newline at end of file