mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Update to work with django 1.3.1

Browse Source 
Submitted by:	delphij
Obtained from:	FreeNAS SVN repo
Sponsored by:	iXsystems
This commit is contained in:
Josh Paetzel 2011-10-03 17:20:42 +00:00
parent 6860a34f4e
commit 488b75b32f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=282881
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/py-dojango/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= dojango
PORTVERSION= 0.5.2
PORTREVISION= 1
CATEGORIES= www python java
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MASTER_SITE_SUBDIR= ""

51
www/py-dojango/files/patch-dojango__forms__fields.py Normal file
View File

@ -0,0 +1,51 @@
--- ./dojango/forms/fields.py.orig 2011-04-14 15:25:02.000000000 -0700
+++ ./dojango/forms/fields.py 2011-09-26 17:14:30.353122595 -0700
@@ -6,8 +6,7 @@
from dojango.util import json_encode
__all__ = (
- 'Field', 'DEFAULT_DATE_INPUT_FORMATS', 'DEFAULT_TIME_INPUT_FORMATS', # original django classes
- 'DEFAULT_DATETIME_INPUT_FORMATS', 'MultiValueField', 'ComboField', # original django classes
+ 'Field', 'MultiValueField', 'ComboField', # original django classes
'DojoFieldMixin', 'CharField', 'ChoiceField', 'TypedChoiceField',
'IntegerField', 'BooleanField', 'FileField', 'ImageField',
'DateField', 'TimeField', 'DateTimeField', 'SplitDateTimeField',
@@ -74,26 +73,30 @@
class ImageField(DojoFieldMixin, fields.ImageField):
widget = widgets.FileInput
+# also support dojo's default date-string
+dj_settings.DATE_INPUT_FORMATS = tuple(list(dj_settings.DATE_INPUT_FORMATS) + [
+ '%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S'
+ ])
+
class DateField(DojoFieldMixin, fields.DateField):
widget = widgets.DateInput
def __init__(self, input_formats=None, min_value=None, max_value=None, *args, **kwargs):
- kwargs['input_formats'] = input_formats or \
- tuple(list(formats.get_format('DATE_INPUT_FORMATS')) + [
- '%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S' # also support dojo's default date-strings
- ])
+ kwargs['input_formats'] = input_formats or formats.get_format('DATE_INPUT_FORMATS')
self.max_value = max_value
self.min_value = min_value
super(DateField, self).__init__(*args, **kwargs)
+# also support dojo's default date-string
+dj_settings.TIME_INPUT_FORMATS = tuple(list(dj_settings.TIME_INPUT_FORMATS) + [
+ '%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S', 'T%H:%M:%S', 'T%H:%M'
+ ])
+
class TimeField(DojoFieldMixin, fields.TimeField):
widget = widgets.TimeInput
def __init__(self, input_formats=None, min_value=None, max_value=None, *args, **kwargs):
- kwargs['input_formats'] = input_formats or \
- tuple(list(formats.get_format('TIME_INPUT_FORMATS')) + [
- '%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S', 'T%H:%M:%S', 'T%H:%M' # also support dojo's default time-strings
- ])
+ kwargs['input_formats'] = input_formats or formats.get_format('TIME_INPUT_FORMATS')
self.max_value = max_value
self.min_value = min_value
super(TimeField, self).__init__(*args, **kwargs)