Navigation

oldforms

Timestamp:

07/01/08 10:49:08 (6 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7814].

Files:

django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7808 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7814

r6776	r7815
681	681	self.validator_list = [self.isNonEmptyFile] + validator_list
682	682
683		def isNonEmptyFile(self, field_data, all_data):
684		try:
685		content = field_data['content']
686		except TypeError:
687		raise validators.CriticalValidationError, ugettext("No file was submitted. Check the encoding type on the form.")
688		if not content:
	683	def isNonEmptyFile(self, new_data, all_data):
	684	if hasattr(new_data, 'upload_errors'):
	685	upload_errors = new_data.upload_errors()
	686	if upload_errors:
	687	raise validators.CriticalValidationError, upload_errors
	688	try:
	689	file_size = new_data.file_size
	690	except AttributeError:
	691	file_size = len(new_data['content'])
	692	if not file_size:
689	693	raise validators.CriticalValidationError, ugettext("The submitted file is empty.")
690	694
…	…
692	696	return mark_safe(u'<input type="file" id="%s" class="v%s" name="%s" />' % \
693	697	(self.get_id(), self.__class__.__name__, self.field_name))
	698
	699	def prepare(self, new_data):
	700	if hasattr(new_data, 'upload_errors'):
	701	upload_errors = new_data.upload_errors()
	702	new_data[self.field_name] = { '_file_upload_error': upload_errors }
694	703
695	704	def html2python(data):