Changeset 7954 for django/branches/newforms-admin/tests

Timestamp:

07/18/08 16:42:08 (6 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7952].

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/tests/regressiontests/views/fixtures/testdata.json (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/views/models.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/views/tests/generic/create_update.py (copied) (copied from django/trunk/tests/regressiontests/views/tests/generic/create_update.py)
• django/branches/newforms-admin/tests/regressiontests/views/tests/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/views/urls.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/views/views.py (modified) (1 diff)
• django/branches/newforms-admin/tests/templates/views/article_confirm_delete.html (copied) (copied from django/trunk/tests/templates/views/article_confirm_delete.html)
• django/branches/newforms-admin/tests/templates/views/article_detail.html (modified) (1 diff)
• django/branches/newforms-admin/tests/templates/views/article_form.html (copied) (copied from django/trunk/tests/templates/views/article_form.html)
• django/branches/newforms-admin/tests/templates/views/urlarticle_detail.html (copied) (copied from django/trunk/tests/templates/views/urlarticle_detail.html)
• django/branches/newforms-admin/tests/templates/views/urlarticle_form.html (copied) (copied from django/trunk/tests/templates/views/urlarticle_form.html)

django/branches/newforms-admin/tests/regressiontests/views/fixtures/testdata.json

@@ -1 +1 @@
-[
+    {
+        "pk": "1",
+        "model": "auth.user",
+        "fields": {
+            "username": "testclient",
+            "first_name": "Test",
+            "last_name": "Client",
+            "is_active": true,
+            "is_superuser": false,
+            "is_staff": false,
+            "last_login": "2006-12-17 07:03:31",
+            "groups": [],
+            "user_permissions": [],
+            "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161",
+            "email": "testclient@example.com",
+            "date_joined": "2006-12-17 07:03:31"
+        }
+    },
-    {
-        "pk": 1, 
@@ -30 +48 @@
-        }
-    }, 
-
+
+
+
+
+
+
+
+
+
+
-    {
-        "pk": 1, 

django/branches/newforms-admin/tests/regressiontests/views/models.py

@@ -1 +1 @@
-"""
-
+.
-"""
-
-from django.db import models
-from django.conf import settings
-
-class Author(models.Model):
@@ -15 +14 @@
-        return '/views/authors/%s/' % self.id
-
-
-
+
+
+
+
+
-    title = models.CharField(max_length=100)
-    slug = models.SlugField()
-    author = models.ForeignKey(Author)
-    date_created = models.DateTimeField()
-
+
+
+
+
-    def __unicode__(self):
-        return self.title
-
+class Article(BaseArticle):
+    pass
+
+class UrlArticle(BaseArticle):
+    """
+    An Article class with a get_absolute_url defined.
+    """
+    def get_absolute_url(self):
+        return '/urlarticles/%s/' % self.slug

django/branches/newforms-admin/tests/regressiontests/views/tests/__init__.py

@@ -3 +3 @@
-from static import *
-from generic.date_based import *
+from generic.create_update import *

django/branches/newforms-admin/tests/regressiontests/views/urls.py

@@ -5 +5 @@
-from models import *
-import views
+
-
-base_dir = path.dirname(path.abspath(__file__))
@@ -15 +16 @@
-}
-
- 
- 
- 
- 
- 
+
+
+
+
+
-
-urlpatterns = patterns('',
-    (r'^$', views.index_page),
-
+
-    # Default views
-    (r'^shortcut/(\d+)/(.*)/$', 'django.views.defaults.shortcut'),
-    (r'^non_existing_url/', 'django.views.defaults.page_not_found'),
-    (r'^server_error/', 'django.views.defaults.server_error'),
-
+
-    # i18n views
-    
+
-    (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
-
+
-    # Static views
-    (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': media_dir}),
-    
-        # Date-based generic views
-    (r'^date_based/object_detail/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/$', 
-        'django.views.generic.date_based.object_detail', 
-        dict(slug_field='slug', **date_based_info_dict)), 
-    (r'^date_based/object_detail/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/allow_future/$', 
-        'django.views.generic.date_based.object_detail', 
-        dict(allow_future=True, slug_field='slug', **date_based_info_dict)), 
-    (r'^date_based/archive_month/(?P<year>\d{4})/(?P<month>\d{1,2})/$', 
-        'django.views.generic.date_based.archive_month', 
-        date_based_info_dict),     
-)
+
+# Date-based generic views.
+urlpatterns += patterns('django.views.generic.date_based',
+    (r'^date_based/object_detail/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/$',
+        'object_detail',
+        dict(slug_field='slug', **date_based_info_dict)),
+    (r'^date_based/object_detail/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>[-\w]+)/allow_future/$',
+        'object_detail',
+        dict(allow_future=True, slug_field='slug', **date_based_info_dict)),
+    (r'^date_based/archive_month/(?P<year>\d{4})/(?P<month>\d{1,2})/$',
+        'archive_month',
+        date_based_info_dict),
+)
+
+# crud generic views.
+
+urlpatterns += patterns('django.views.generic.create_update',
+    (r'^create_update/member/create/article/$', 'create_object',
+        dict(login_required=True, model=Article)),
+    (r'^create_update/create/article/$', 'create_object',
+        dict(post_save_redirect='/views/create_update/view/article/%(slug)s/',
+             model=Article)),
+    (r'^create_update/update/article/(?P<slug>[-\w]+)/$', 'update_object',
+        dict(post_save_redirect='/views/create_update/view/article/%(slug)s/',
+             slug_field='slug', model=Article)),
+    (r'^create_update/create_custom/article/$', views.custom_create),
+    (r'^create_update/delete/article/(?P<slug>[-\w]+)/$', 'delete_object',
+        dict(post_delete_redirect='/views/create_update/', slug_field='slug',
+             model=Article)),
+
+    # No post_save_redirect and no get_absolute_url on model.
+    (r'^create_update/no_redirect/create/article/$', 'create_object',
+        dict(model=Article)),
+    (r'^create_update/no_redirect/update/article/(?P<slug>[-\w]+)/$',
+        'update_object', dict(slug_field='slug', model=Article)),
+
+    # get_absolute_url on model, but no passed post_save_redirect.
+    (r'^create_update/no_url/create/article/$', 'create_object',
+        dict(model=UrlArticle)),
+    (r'^create_update/no_url/update/article/(?P<slug>[-\w]+)/$',
+        'update_object', dict(slug_field='slug', model=UrlArticle)),
+)

django/branches/newforms-admin/tests/regressiontests/views/views.py

@@ -1 +1 @@
-from django.http import HttpResponse
+import django.newforms as forms
+from django.views.generic.create_update import create_object
+
+from models import Article
+
-
-def index_page(request):
-    """Dummy index page"""
-    return HttpResponse('<html><body>Dummy page</body></html>')
+
+
+def custom_create(request):
+    """
+    Calls create_object generic view with a custom form class.
+    """
+    class SlugChangingArticleForm(forms.ModelForm):
+        """Custom form class to overwrite the slug."""
+
+        class Meta:
+            model = Article
+
+        def save(self, *args, **kwargs):
+            self.cleaned_data['slug'] = 'some-other-slug'
+            return super(SlugChangingArticleForm, self).save(*args, **kwargs)
+
+    return create_object(request,
+        post_save_redirect='/views/create_update/view/article/%(slug)s/',
+        form_class=SlugChangingArticleForm)

django/branches/newforms-admin/tests/templates/views/article_detail.html

@@ -1 @@
-
+