* 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

@@ -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

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}"
   

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}"
   

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}"
   

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}"
   

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}"
   

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}"
   

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}"
   

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}"