Changeset 1244
- Timestamp:
- 11/15/05 09:10:11 (3 years ago)
- Files:
-
- django/branches/new-admin/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
- django/branches/new-admin/django/conf/locale/sr/LC_MESSAGES/django.mo (modified) (previous)
- django/branches/new-admin/django/contrib/admin/templatetags/admin_list.py (modified) (1 diff)
- django/branches/new-admin/django/core/formfields.py (modified) (2 diffs)
- django/branches/new-admin/django/core/meta/fields.py (modified) (4 diffs)
- django/branches/new-admin/django/core/template/__init__.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/new-admin/django/contrib/admin/templatetags/admin_list.py
r1235 r1244 211 211 first = False 212 212 url = cl.url_for_result(result) 213 result_id = getattr(result, pk) 213 214 yield ('<th%s><a href="%s"%s>%s</a></th>' % \ 214 215 (row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %r); return false;"' % result_id or ''), result_repr)) django/branches/new-admin/django/core/formfields.py
r1240 r1244 110 110 def __getitem__(self, key): 111 111 for field in self.manipulator.fields: 112 112 113 if field.field_name == key: 113 114 data = field.extract_data(self.data) … … 118 119 if inline_collection.name == key: 119 120 return inline_collection 120 121 raise KeyError 121 raise KeyError("Could not find Formfield or InlineObjectCollection named:%s" % key ) 122 122 123 123 def fill_inline_collections(self): django/branches/new-admin/django/core/meta/fields.py
r1240 r1244 403 403 return value 404 404 405 # Needed because of horrible auto_now[_add] behaviour wrt. editable 406 def get_follow(self, override=None): 407 if override != None: 408 return override 409 else: 410 return self.editable or self.auto_now or self.auto_now_add 411 405 412 def get_db_prep_save(self, value): 406 413 # Casts dates into string format for entry into database. … … 861 868 yield bound_field 862 869 863 def __repr__(self): 864 return "%s:(%s)" % (self.__class__.__name__, self.bound_fields) 865 870 866 871 def __len__(self): 867 872 return len(self.bound_fields) … … 882 887 883 888 def __len__(self): 884 return len(self.fields) 889 return len(self.fields) 885 890 886 891 class BoundFieldSet(object): … … 890 895 self.bound_field_lines = [ field_line.bind(field_mapping,original, bound_field_line_class) 891 896 for field_line in field_set] 892 def __repr__(self): 893 return "%s:(%s,%s)" % (self.__class__.__name__, self.name, self.bound_field_lines) 894 897 895 898 def __iter__(self): 896 899 for bound_field_line in self.bound_field_lines: django/branches/new-admin/django/core/template/__init__.py
r1223 r1244 827 827 raise 828 828 except Exception, e: 829 830 829 from traceback import extract_tb, format_list, format_exception_only 831 830 from sys import exc_info
