Changeset 37:3f4fe8317095
- Timestamp:
- 08/21/08 00:06:22 (3 months ago)
- Author:
- Jeffrey Gelens <jeffrey@…>
- Children:
- 38:5386a7c8c14d, 40:d9dcd0379538
- Branch:
- default
- Message:
-
Updating to django-trunk
- Files:
-
- 1 added
- 7 removed
- 5 modified
Legend:
- Unmodified
- Added
- Removed
-
|
r28
|
r37
|
|
| 16 | 16 | search_fields = ('title','body') |
| 17 | 17 | |
| 18 | | |
| 19 | | |
| | 18 | #admin.site.register(models.Link) |
| | 19 | #admin.site.register(models.Article, ArticleOptions) |
-
|
r28
|
r37
|
|
| 1 | 1 | from django.db import models |
| 2 | 2 | from django.db.models import permalink |
| 3 | | from django import newforms as forms |
| 4 | | from django.newforms.widgets import * |
| | 3 | from django import forms |
| | 4 | from django.forms.widgets import * |
| 5 | 5 | |
| 6 | 6 | class Link(models.Model): |
-
|
r19
|
r37
|
|
| 1 | 1 | from django.conf import settings |
| 2 | 2 | from django.db.models import signals |
| 3 | | from django.dispatch import dispatcher |
| | 3 | from django.dispatch import Signal |
| 4 | 4 | from django.contrib.comments.models import FreeComment |
| 5 | 5 | from django.contrib.sites.models import Site |
| 6 | 6 | from django.contrib.flatpages.models import FlatPage |
| 7 | 7 | from blog.models import Article |
| 8 | | #from utils.generator import quick_publish |
| 9 | 8 | |
| 10 | | #def publish(sender, instance): |
| 11 | | # quick_publish([instance, '/']) |
| 12 | | # |
| 13 | | #def publish_comment(sender, instance): |
| 14 | | # quick_publish([instance.get_content_object()]) |
| 15 | | # |
| 16 | | #dispatcher.connect(publish, sender=FlatPage, signal=signals.post_save) |
| 17 | | #dispatcher.connect(publish, sender=Article, signal=signals.post_save) |
| 18 | | #dispatcher.connect(publish_comment, sender=FreeComment, signal=signals.post_save) |
| 19 | | |
| 20 | | def moderate_comments(sender, instance): |
| | 9 | def moderate_comments(**kwargs): |
| 21 | 10 | """ |
| 22 | 11 | Applies comment moderation to newly-posted comments. |
| … |
… |
|
| 37 | 26 | |
| 38 | 27 | """ |
| | 28 | |
| | 29 | sender = kwargs['sender'] |
| | 30 | instance = kwargs['instance'] |
| | 31 | |
| 39 | 32 | if not instance.id: # Only check when the comment is first saved. |
| 40 | 33 | content_object = instance.get_content_object() |
| … |
… |
|
| 54 | 47 | instance.is_public = False |
| 55 | 48 | |
| 56 | | dispatcher.connect(moderate_comments, sender=FreeComment, signal=signals.pre_save) |
| | 49 | Signal().connect(moderate_comments, sender=FreeComment) |
-
|
r31
|
r37
|
|
| 5 | 5 | USE_ETAGS = True |
| 6 | 6 | DEFAULT_CONTENT_TYPE="application/xhtml+xml" |
| | 7 | DJANGO_ROOT = os.path.abspath(os.path.dirname(__file__)) |
| | 8 | |
| | 9 | MEDIA_ROOT = DJANGO_ROOT + "/static" |
| | 10 | MEDIA_URL = '' |
| | 11 | ADMIN_MEDIA_PREFIX = '/media/' |
| 7 | 12 | |
| 8 | 13 | TEMPLATE_LOADERS = ( |
| … |
… |
|
| 23 | 28 | |
| 24 | 29 | INSTALLED_APPS = ( |
| | 30 | 'django.contrib.auth', |
| 25 | 31 | 'django.contrib.admin', |
| 26 | | 'django.contrib.auth', |
| 27 | 32 | 'django.contrib.comments', |
| 28 | 33 | 'django.contrib.contenttypes', |
| … |
… |
|
| 33 | 38 | 'django.contrib.markup', |
| 34 | 39 | 'gelens_org.blog', |
| | 40 | 'extensions', |
| 35 | 41 | ) |
| | 42 | |
| | 43 | ROOT_URLCONF = 'urls' |
| | 44 | TEMPLATE_DIRS = (DJANGO_ROOT + "/templates",) |
| 36 | 45 | |
| 37 | 46 | try: |
-
|
r18
|
r37
|
|
| 2 | 2 | from django.conf import settings |
| 3 | 3 | from django.contrib import admin |
| | 4 | admin.autodiscover() |
| 4 | 5 | |
| 5 | 6 | urlpatterns = patterns('', |
| 6 | | (r'^', include('blog.urls')), |
| 7 | | (r'^admin/doc/', include('django.contrib.admindocs.urls')), |
| 8 | 7 | (r'^admin/(.*)', admin.site.root), |
| 9 | 8 | (r'^comments/', include('django.contrib.comments.urls.comments')), |
| | 9 | (r'^', include('blog.urls')), |
| 10 | 10 | ) |
| 11 | 11 | |
