* small fixes to file validation

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@79 5e329b0b-a2ee-ea63-e329-299493fc886d
This commit is contained in:
vit.jonas@gmail.com 2011-05-24 20:04:29 +00:00
parent d1a72ce048
commit 4333fac465
2 changed files with 3 additions and 2 deletions

View File

@ -129,7 +129,8 @@ class DmsfDetailController < ApplicationController
@file.name = @revision.name
@file.folder = @revision.folder
if @revision.save && @file.valid?
if @revision.valid? && @file.valid?
@revision.save!
unless file_upload.nil?
@revision.copy_file_content(file_upload)
end

View File

@ -43,7 +43,7 @@ class DmsfFile < ActiveRecord::Base
def validates_name_uniqueness
existing_file = DmsfFile.find_file_by_name(self.project, self.folder, self.name)
errors.add(:name, "has already been taken") unless
errors.add(:name, l("activerecord.errors.messages.taken")) unless
existing_file.nil? || existing_file.id == self.id
end