Changeset 1175

Timestamp:

11/11/05 12:10:36 (3 years ago)

Author:

rjwittams

Message:

Merged to trunk r1174, some other fixes

Files:

• django/branches/new-admin/django/bin/django-admin.py (modified) (1 diff)
• django/branches/new-admin/django/contrib/admin/templatetags/admin_list.py (modified) (1 diff)
• django/branches/new-admin/django/contrib/admin/templatetags/admin_modify.py (modified) (1 diff)
• django/branches/new-admin/django/core/meta/__init__.py (modified) (2 diffs)
• django/branches/new-admin/docs/outputting_csv.txt (added)

django/branches/new-admin/django/bin/django-admin.py

@@ -78 +78 @@
-        action = args[0]
-    except IndexError:
-rint_error("An action is required.", sys.argv[0]
+arser.print_usage_and_exit(
-    if not ACTION_MAPPING.has_key(action):
-        print_error("Your action, %r, was invalid." % action, sys.argv[0])

django/branches/new-admin/django/contrib/admin/templatetags/admin_list.py

@@ -156 +156 @@
-            # For non-field list_display values, the value is a method
-            # name. Execute the method.
+            func = getattr(result, field_name)
-            try:
-ip_tags(str(getattr(result, field_name)()
+(func(
-            except ObjectDoesNotExist:
-                result_repr = EMPTY_CHANGELIST_VALUE
+            else:
+                # Strip HTML tags in the resulting text, except if the 
+                # function has an "allow_tags" attribute set to True. 
+                if not getattr(func, 'allow_tags', False): 
+                    result_repr = strip_tags(result_repr)
-        else:
-            field_val = getattr(result, f.attname)

django/branches/new-admin/django/contrib/admin/templatetags/admin_modify.py

@@ -31 +31 @@
-    has_delete_permission = context['has_delete_permission']
-    is_popup = context['is_popup']
-    print is_popup.something
-    return {
-        'onclick_attrib' : (bound_manipulator.ordered_objects and change 

django/branches/new-admin/django/core/meta/__init__.py

@@ -266 +266 @@
-
-    def get_method_name_part(self):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class Options:
@@ -387 +404 @@
-    def get_delete_permission(self):
-        return 'delete_%s' % self.object_name.lower()
-
-    def get_rel_object_method_name(self, rel_opts, rel_field):
-        # This method encapsulates the logic that decides what name to give a
-        # method that retrieves related many-to-one objects. Usually it just
-        # uses the lower-cased object_name, but if the related object is in
-        # another app, its app_label is appended.
-        #
-        # Examples:
-        #
-        #   # Normal case -- a related object in the same app.
-        #   # This method returns "choice".
-        #   Poll.get_choice_list()
-        #
-        #   # A related object in a different app.
-        #   # This method returns "lcom_bestofaward".
-        #   Place.get_lcom_bestofaward_list() # "lcom_bestofaward"
-        rel_obj_name = rel_field.rel.related_name or rel_opts.object_name.lower()
-        if self.app_label != rel_opts.app_label:
-            rel_obj_name = '%s_%s' % (rel_opts.app_label, rel_obj_name)
-        return rel_obj_name
-
-    def get_all_related_objects(self):