Changeset 1675

Timestamp:

12/15/05 17:26:04 (3 years ago)

Author:

rjwittams

Message:

Changes to get admin semi-working

Files:

• django/branches/magic-removal/django/contrib/admin/templatetags/adminapplist.py (modified) (2 diffs)
• django/branches/magic-removal/django/contrib/admin/templatetags/admin_list.py (modified) (2 diffs)
• django/branches/magic-removal/django/contrib/admin/urls/admin.py (modified) (1 diff)
• django/branches/magic-removal/django/contrib/admin/views/main.py (modified) (12 diffs)
• django/branches/magic-removal/django/core/paginator.py (modified) (5 diffs)
• django/branches/magic-removal/django/db/models/__init__.py (modified) (4 diffs)

django/branches/magic-removal/django/contrib/admin/templatetags/adminapplist.py

@@ -18 +18 @@
-            if has_module_perms:
-                model_list = []
+                #HACK
+                app_url = "/".join( [comp for comp in app.__name__.split('.') if comp != 'models' ])
-                for m in app._MODELS:
-                    if m._meta.admin:
@@ -29 +31 @@
-                        # Check whether user has any perm for this module.
-                        # If so, add the module to the model_list.
+                        
+                        
-                        if True in perms.values():
-                            model_list.append({
-                                'name': capfirst(m._meta.verbose_name_plural),
-'%s/%s/' % (app_label, m._meta.module_name
+ '%s/%s/' % (app_url, m.__name__.lower()
-                                'perms': perms,
-                            })

django/branches/magic-removal/django/contrib/admin/templatetags/admin_list.py

@@ -191 +191 @@
-#@register.inclusion_tag("admin/date_hierarchy")
-def date_hierarchy(cl):
-lookup_mod
-lookup_mod
+manager
+manager
-
-    if lookup_opts.admin.date_hierarchy:
@@ -209 +209 @@
-
-        def get_dates(unit, params):
-lookup_mod
+manager
-
-        if year_lookup and month_lookup and day_lookup:

django/branches/magic-removal/django/contrib/admin/urls/admin.py

@@ -49 +49 @@
-
-urlpatterns += (
-
-
-
-
-
-
+
+
+
+
+
-)
-urlpatterns = patterns('', *urlpatterns)

django/branches/magic-removal/django/contrib/admin/views/main.py

@@ -1 +1 @@
-# Generic admin views.
+from django.conf import settings
-from django.contrib.admin.views.decorators import staff_member_required
-from django.contrib.admin.filterspecs import FilterSpec
@@ -22 +23 @@
-from django.utils.html import escape
-import operator
+from itertools import izip
-
-# The system will display a "Show all" link only if the total result count
@@ -42 +44 @@
-    "Helper function that returns a tuple of (module, opts), raising Http404 if necessary."
-    try:
-module(app_label, module_name
+app(app_label
-    except ImportError:
-        raise Http404 # Invalid app or module name. Maybe it's not in INSTALLED_APPS.
@@ -50 +52 @@
-    return mod, opts
-
+def matches_app(mod, comps):
+    modcomps = mod.__name__.split('.')[:-1] #HACK: leave off 'models'
+    for c, mc in izip(comps, modcomps):
+        if c != mc:
+            return ([],False)
+    return (comps[len(modcomps):], True)
+
+def find_model(mod, remaining):
+   # print "finding ", mod, remaining
+    if len(remaining) == 0:
+       # print "no comps left"
+        raise Http404
+    if len(remaining) == 1:
+        if hasattr(mod, '_MODELS'):
+            name = remaining[0]
+            for model in mod._MODELS:
+                print "'%s'" % name, model
+                if model.__name__.lower() == name:
+                    return model
+            raise Http404
+        else:
+            raise Http404
+    else:
+        child = getattr(mod, remaining[0], None)
+       # print mod, remaining[0], child
+        if child:
+            return find_model(child, remaining[1:])
+        else:
+            raise Http404
+
+def get_app_label(mod):
+    modcomps = mod.__name__.split('.')
+    return modcomps[-2]
+
+def get_model_and_app(path):
+    comps = path.split('/')
+    comps = comps[:-1] # remove '' after final /
+    for mod in models.get_installed_models():  
+        remaining, matched =  matches_app(mod, comps)
+        if matched and len(remaining) > 0:
+           # print "matched ", mod 
+           # print "left", remaining
+            return ( find_model(mod, remaining), get_app_label(mod) )
+            
+    raise Http404 # Couldn't find app
+
-def index(request):
-    return render_to_response('admin/index', {'title': _('Site administration')}, context_instance=Context(request))
@@ -58 +106 @@
-
-class ChangeList(object):
-app_label, module_name
-get_modules_and_options(app_label, module_name
+path
+resolve_model(path
-        self.get_search_parameters(request)
-        self.get_ordering()
@@ -95 +143 @@
-        return '?' + '&'.join(['%s=%s' % (k, v) for k, v in p.items()]).replace(' ', '%20')
-
-
-
-
+
+
+
+
+
+
-            raise PermissionDenied
-
-
+
+
-
-    def get_search_parameters(self, request):
@@ -115 +167 @@
-
-    def get_results(self, request):
-lookup_mod
-lookup_mod
+manager
+manager
-        # Get the results.
-        try:
-lookup_mod
+manager
-        # Naked except! Because we don't have any other way of validating "params".
-        # They might be invalid if the keyword arguments are incorrect, or if the
@@ -131 +183 @@
-        del real_lookup_params['order_by']
-        if real_lookup_params:
-lookup_mod
+manager
-        else:
-            full_result_count = paginator.hits
@@ -141 +193 @@
-        # Get the list of objects to display on this page.
-        if (show_all and can_show_all) or not multi_page:
-lookup_mod
+manager
-        else:
-            try:
@@ -232 +284 @@
-        self.lookup_params = lookup_params
-
-
+
+
-    try:
-app_label, module_name
+path
-    except IncorrectLookupParameters:
-        return HttpResponseRedirect(request.path)
@@ -243 +296 @@
-        'cl' : cl
-    })
-
-
-
+cl.
+cl.
+cl.
-                               'admin/change_list'], context_instance=c)
-change_list = staff_member_required(change_list)
@@ -465 +518 @@
-    LogEntry.objects.log_action(user.id, opts.get_content_type_id(), pk_value, str(new_object), CHANGE, change_message)
-
-
-
+
+
+
+
+
-    if not request.user.has_perm(app_label + '.' + opts.get_change_permission()):
-        raise PermissionDenied
-    if request.POST and request.POST.has_key("_saveasnew"):
-app_label, module_name
+path
-    try:
-        manipulator = mod.ChangeManipulator(object_id)

django/branches/magic-removal/django/core/paginator.py

@@ -1 +1 @@
-from copy import copy
-from math import ceil
+from django.db.models import ModelBase
-
-class InvalidPage(Exception):
@@ -7 +8 @@
-class ObjectPaginator:
-    """
-odule
-and a dictionary of arguments
-to be passed to those methods, plus the number of objects you want
-on each page. Then read the hits and pages properties to see how
-many pages it involves. Call get_page with a page number (starting
-
-
+anager
+or a model which has a default manager,
+and a dictionary of arguments to be passed to those methods, plus the 
+number of objects you want on each page. Then read the hits and pages 
+properties to see how many pages it involves. Call get_page with a page 
+number (starting 
+
-    Finally, check if a page number has a next/prev page using
-    has_next_page(page_number) and has_previous_page(page_number).
-    """
-
-
+
+
+
+
+
+
-        self.num_per_page = num_per_page
-        self.count_method, self.list_method = count_method, list_method
@@ -36 +41 @@
-        # record to determine whether there's a next page.
-        args['limit'] = self.num_per_page + 1
-odule
+anager
-        if not object_list:
-            raise InvalidPage
@@ -49 +54 @@
-                args['offset'] = (page_number + 1) * self.num_per_page
-                args['limit'] = 1
-odule
+anager
-                self._has_next[page_number] = (object_list != [])
-            else:
@@ -65 +70 @@
-            if order_args.has_key('select_related'):
-                del order_args['select_related']
-odule
+anager
-        return self._hits
-

django/branches/magic-removal/django/db/models/__init__.py

@@ -1052 +1052 @@
-    delete.alters_data = True
-
+    def __get_add_manipulator(cls):
+        cls.AddManipulator = get_manipulator
+        
+    AddManipulator = property(classmethod(__get_add_manipulator))
+    
+    def __get_change_manipulator(cls):
+        
+    ChangeManipulator = property(classmethod(__get_change_manipulator)) 
+    
+    
+
-    def __get_FIELD_display(self, field):
-        value = getattr(self, field.attname)
@@ -1258 +1269 @@
-        cursor.executemany(sql, [(this_id, i) for i in id_list])
-        connection.commit()
+
+
-
-
@@ -1504 +1517 @@
-    return man
-
+class AutomaticManipulator(formfields.Manipulator):
+    def __classinit__(cls, model):
+        cls.model = model
+        cls.manager = model._default_manager
+    __classinit__ = classmethod(__classinit__)
+    
+    def __init__(self, follow=None):
+        self.follow = self.model._meta.get_follow(follow)
+        self.fields = []
+
+        for f in opts.fields + opts.many_to_many:
+            if self.follow.get(f.name, False):
+                self.fields.extend(f.get_manipulator_fields(opts, self, change))
+    
+        # Add fields for related objects.
+        for f in opts.get_all_related_objects():
+            if self.follow.get(f.name, False):
+                fol = self.follow[f.name]
+                self.fields.extend(f.get_manipulator_fields(opts, self, change, fol))
+        
+    def save(self):
+        pass
+    
+    def get_related_objects(opts, klass, add, change, self):
+        return opts.get_followed_related_objects(self.follow)
+
+    def flatten_data(opts, klass, add, change, self):
+         new_data = {}
+         obj = change and self.original_object or None
+         for f in opts.get_data_holders(self.follow):
+            fol = self.follow.get(f.name)
+            new_data.update(f.flatten_data(fol, obj))
+         return new_data
+
+class ModelAddManipulator(AutomaticManipulator):
+    pass
+
+class ModelSaveManipulator(AutomaticManipulator):
+    def __init__(self, obj_key=None, follow=None):
+       
+        assert obj_key is not None, "ChangeManipulator.__init__() must be passed obj_key parameter."
+        self.obj_key = obj_key
+        try:
+            self.original_object = self.manager.get_object(pk=obj_key)
+        except ObjectDoesNotExist:
+            # If the object doesn't exist, this might be a manipulator for a
+            # one-to-one related object that hasn't created its subobject yet.
+            # For example, this might be a Restaurant for a Place that doesn't
+            # yet have restaurant information.
+            if opts.one_to_one_field:
+                # Sanity check -- Make sure the "parent" object exists.
+                # For example, make sure the Place exists for the Restaurant.
+                # Let the ObjectDoesNotExist exception propogate up.
+                lookup_kwargs = opts.one_to_one_field.rel.limit_choices_to
+                lookup_kwargs['%s__exact' % opts.one_to_one_field.rel.field_name] = obj_key
+                _ = opts.one_to_one_field.rel.to._meta.get_model_module().get_object(**lookup_kwargs)
+                params = dict([(f.attname, f.get_default()) for f in opts.fields])
+                params[opts.pk.attname] = obj_key
+                self.original_object = opts.get_model_module().Klass(**params)
+            else:
+                raise
+        
+        super(ModelSaveManipulator, self).__init__(self, follow=follow)
+        
+        if  opts.get_ordered_objects():
+            self.fields.append(formfields.CommaSeparatedIntegerField(field_name="order_"))
+
-def manipulator_init(opts, add, change, self, obj_key=None, follow=None):
-    self.follow = opts.get_follow(follow)
@@ -1692 +1772 @@
-    return new_object
-
-
-
-
-
-
-
-
-
-
-
+
-
-def manipulator_validator_unique_together(field_name_list, opts, self, field_data, all_data):