From a4b1292071f4950645beb2a5030449b9eaff0276 Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Tue, 24 May 2011 13:01:17 +0000 Subject: [PATCH] * simple validation for commit git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@77 5e329b0b-a2ee-ea63-e329-299493fc886d --- app/controllers/dmsf_detail_controller.rb | 6 +++++- config/locales/cs.yml | 1 + config/locales/de.yml | 1 + config/locales/en-GB.yml | 1 + config/locales/en.yml | 1 + config/locales/es.yml | 1 + config/locales/fr.yml | 1 + config/locales/ja.yml | 1 + config/locales/ru.yml | 1 + 9 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/controllers/dmsf_detail_controller.rb b/app/controllers/dmsf_detail_controller.rb index 70aac421..39ace185 100644 --- a/app/controllers/dmsf_detail_controller.rb +++ b/app/controllers/dmsf_detail_controller.rb @@ -246,7 +246,7 @@ class DmsfDetailController < ApplicationController new_revision.major_version = 0 else if file.locked_for_user? - flash[:error] = l(:error_file_is_locked) + failed_uploads.push(commited_file) next end last_revision = file.last_revision @@ -273,6 +273,7 @@ class DmsfDetailController < ApplicationController file_upload = File.new(commited_disk_filepath, "rb") if file_upload.nil? + failed_uploads.push(commited_file) flash[:error] = l(:error_file_commit_require_uploaded_file) next end @@ -305,6 +306,9 @@ class DmsfDetailController < ApplicationController Rails.logger.error "Could not send email notifications: " + e end end + unless failed_uploads.empty? + flash[:warning] = l(:warning_some_files_were_not_commited, :files => failed_uploads.map{|u| u["name"]}.join(", ")) + end end redirect_to :controller => "dmsf", :action => "index", :id => @project, :folder_id => @folder end diff --git a/config/locales/cs.yml b/config/locales/cs.yml index d583d48c..29e5152b 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -140,4 +140,5 @@ cs: :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" :error_contains_invalid_character: "contains invalid character(s)" :error_file_commit_require_uploaded_file: "File commit require uploaded file" + :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" \ No newline at end of file diff --git a/config/locales/de.yml b/config/locales/de.yml index a3ee85a3..8fca80d5 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -136,4 +136,5 @@ de: :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" :error_contains_invalid_character: "contains invalid character(s)" :error_file_commit_require_uploaded_file: "File commit require uploaded file" + :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" \ No newline at end of file diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 082af0b1..c5c889dc 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -136,4 +136,5 @@ en-GB: :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" :error_contains_invalid_character: "contains invalid character(s)" :error_file_commit_require_uploaded_file: "File commit require uploaded file" + :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 8ab7bc71..c2e69621 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -140,4 +140,5 @@ en: :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" :error_contains_invalid_character: "contains invalid character(s)" :error_file_commit_require_uploaded_file: "File commit require uploaded file" + :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 206d5273..5a886faf 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -138,4 +138,5 @@ es: :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" :error_contains_invalid_character: "contains invalid character(s)" :error_file_commit_require_uploaded_file: "File commit require uploaded file" + :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2b09911e..7a2b9136 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -136,4 +136,5 @@ fr: :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" :error_contains_invalid_character: "contains invalid character(s)" :error_file_commit_require_uploaded_file: "File commit require uploaded file" + :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" \ No newline at end of file diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 8ab7bc71..c2e69621 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -140,4 +140,5 @@ en: :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" :error_contains_invalid_character: "contains invalid character(s)" :error_file_commit_require_uploaded_file: "File commit require uploaded file" + :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" \ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8bfe6ce8..2e503063 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -136,4 +136,5 @@ ru: :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" :error_contains_invalid_character: "contains invalid character(s)" :error_file_commit_require_uploaded_file: "File commit require uploaded file" + :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" \ No newline at end of file