Refixed raw_id admin, cheers bitprophet. Tiny regex filter parser change.

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1069 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/core/formfields.py

@@ -619,8 +619,10 @@ class ImageUploadField(FileUploadField):
 ####################
 
 class IntegerField(TextField):
-    def __init__(self, field_name, length=10, maxlength=None, is_required=False, validator_list=[]):
+    def __init__(self, field_name, length=10, maxlength=None, is_required=False, validator_list=[], member_name=None):
         validator_list = [self.isInteger] + validator_list
+        if member_name is not None:
+	   self.member_name = member_name
         TextField.__init__(self, field_name, length, maxlength, is_required, validator_list)
 
     def isInteger(self, field_data, all_data):

django/core/meta/fields.py

@@ -196,11 +196,11 @@ class Field(object):
         if self.maxlength and not self.choices: # Don't give SelectFields a maxlength parameter.
             params['maxlength'] = self.maxlength
         if isinstance(self.rel, ManyToOne):
+            params['member_name'] = name_prefix + self.get_db_column()
             if self.rel.raw_id_admin:
                 field_objs = self.get_manipulator_field_objs()
                 params['validator_list'].append(curry(manipulator_valid_rel_key, self, manipulator))
             else:
-                params['member_name'] = name_prefix + self.get_db_column()
                 if self.radio_admin:
                     field_objs = [formfields.RadioSelectField]
                     params['ul_class'] = get_ul_class(self.radio_admin)

django/core/template/__init__.py

@@ -530,7 +530,7 @@ filter_raw_string = r"""
               %(i18n_open)s"(?P<i18n_arg>%(str)s)"%(i18n_close)s|
               "(?P<arg>%(str)s)"
              )
-         ){0,1}
+         )?
  )""" % {
     'str': r"""[^"\\]*(?:\\.[^"\\]*)*""",
     'var_chars': "A-Za-z0-9\_\." ,