From e4c38302e08e24e4c0abd1f6acb0e33fa5dcb3dd Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Tue, 15 Apr 2014 21:55:24 +0300 Subject: [PATCH 001/298] Add fields for scheduled publishing Also add a clean method to Page to check that expiry date is in the future and that go live date is before expiry date. In order to display the correct error message the views/pages.py view has to be changed to display the error message from clean. Finally add the migration for the new fields. --- wagtail/wagtailadmin/views/pages.py | 7 +- .../0003_fields_for_scheduled_publishing.py | 130 ++++++++++++++++++ wagtail/wagtailcore/models.py | 24 +++- 3 files changed, 156 insertions(+), 5 deletions(-) create mode 100644 wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 3fb905715..9e71a612f 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -7,7 +7,7 @@ from django.contrib import messages from django.contrib.contenttypes.models import ContentType from django.contrib.auth.decorators import permission_required from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext as _ from django.views.decorators.vary import vary_on_headers from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList @@ -199,7 +199,10 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ return redirect('wagtailadmin_explore', page.get_parent().id) else: - messages.error(request, _("The page could not be created due to errors.")) + if form.errors and form.errors.get('__all__'): + messages.error(request, _("The page could not be created: ") + ', '.join(form.errors['__all__'])) + else: + messages.error(request, _("The page could not be created due to errors.")) edit_handler = edit_handler_class(instance=page, form=form) else: form = form_class(instance=page) diff --git a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py b/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py new file mode 100644 index 000000000..5e682aa59 --- /dev/null +++ b/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py @@ -0,0 +1,130 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'PageRevision.approved_go_live_datetime' + db.add_column(u'wagtailcore_pagerevision', 'approved_go_live_datetime', + self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), + keep_default=False) + + # Adding field 'Page.go_live_datetime' + db.add_column(u'wagtailcore_page', 'go_live_datetime', + self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), + keep_default=False) + + # Adding field 'Page.expiry_datetime' + db.add_column(u'wagtailcore_page', 'expiry_datetime', + self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), + keep_default=False) + + # Adding field 'Page.expired' + db.add_column(u'wagtailcore_page', 'expired', + self.gf('django.db.models.fields.BooleanField')(default=False), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'PageRevision.approved_go_live_datetime' + db.delete_column(u'wagtailcore_pagerevision', 'approved_go_live_datetime') + + # Deleting field 'Page.go_live_datetime' + db.delete_column(u'wagtailcore_page', 'go_live_datetime') + + # Deleting field 'Page.expiry_datetime' + db.delete_column(u'wagtailcore_page', 'expiry_datetime') + + # Deleting field 'Page.expired' + db.delete_column(u'wagtailcore_page', 'expired') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'wagtailcore.grouppagepermission': { + 'Meta': {'object_name': 'GroupPagePermission'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': u"orm['wagtailcore.Page']"}), + 'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}) + }, + u'wagtailcore.page': { + 'Meta': {'object_name': 'Page'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'expiry_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'go_live_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + u'wagtailcore.pagerevision': { + 'Meta': {'object_name': 'PageRevision'}, + 'approved_go_live_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'content_json': ('django.db.models.fields.TextField', [], {}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': u"orm['wagtailcore.Page']"}), + 'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + u'wagtailcore.site': { + 'Meta': {'object_name': 'Site'}, + 'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), + 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"}) + } + } + + complete_apps = ['wagtailcore'] \ No newline at end of file diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index d322ab69b..96e670ef9 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -7,10 +7,13 @@ from django.db import models, connection, transaction from django.db.models import get_model, Q from django.http import Http404 from django.core.cache import cache +from django.core.exceptions import ValidationError from django.contrib.contenttypes.models import ContentType from django.contrib.auth.models import Group from django.conf import settings from django.template.response import TemplateResponse +from django.utils import timezone +from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailcore.util import camelcase_to_underscore @@ -234,6 +237,10 @@ class Page(MP_Node, ClusterableModel, Indexed): show_in_menus = models.BooleanField(default=False, help_text=_("Whether a link to this page will appear in automatically generated menus")) search_description = models.TextField(blank=True) + go_live_datetime = models.DateTimeField(verbose_name=_("Go live date/time"), blank=True, null=True) + expiry_datetime = models.DateTimeField(verbose_name=_("Expiry date/time"), blank=True, null=True) + expired = models.BooleanField(default=False, editable=False) + indexed_fields = { 'title': { 'type': 'string', @@ -320,7 +327,7 @@ class Page(MP_Node, ClusterableModel, Indexed): SET url_path = %s || substring(url_path from %s) WHERE path LIKE %s AND id <> %s """ - cursor.execute(update_statement, + cursor.execute(update_statement, [new_url_path, len(old_url_path) + 1, self.path + '%', self.id]) @property @@ -399,8 +406,8 @@ class Page(MP_Node, ClusterableModel, Indexed): def serve(self, request): return TemplateResponse( - request, - self.get_template(request), + request, + self.get_template(request), self.get_context(request) ) @@ -448,6 +455,16 @@ class Page(MP_Node, ClusterableModel, Indexed): if self.url_path.startswith(root_path): return ('' if current_site.id == id else root_url) + self.url_path[len(root_path) - 1:] + def clean(self): + super(Page, self).clean() + + if self.go_live_datetime and self.expiry_datetime: + if self.go_live_datetime > self.expiry_datetime: + raise ValidationError(ugettext('Go live date/time should be before expiry datetime.')) + + if self.expiry_datetime and self.expiry_datetime < timezone.now(): + raise ValidationError(ugettext('Expiry date/time should be in the future')) + @classmethod def search(cls, query_string, show_unpublished=False, search_title_only=False, extra_filters={}, prefetch_related=[], path=None): # Filters @@ -642,6 +659,7 @@ class PageRevision(models.Model): created_at = models.DateTimeField(auto_now_add=True) user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True) content_json = models.TextField() + approved_go_live_datetime = models.DateTimeField(null=True, blank=True) objects = models.Manager() submitted_revisions = SubmittedRevisionsManager() From a40c71687de01c6ccf2d8c983a14dc41eec82bea Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Wed, 16 Apr 2014 10:27:07 +0300 Subject: [PATCH 002/298] Show clean model errors on edit also --- wagtail/wagtailadmin/views/pages.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 9e71a612f..703d9f8dd 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -279,7 +279,11 @@ def edit(request, page_id): return redirect('wagtailadmin_explore', page.get_parent().id) else: - messages.error(request, _("The page could not be saved due to validation errors")) + if form.errors and form.errors.get('__all__'): + messages.error(request, _("The page could not be saved: ") + ', '.join(form.errors['__all__'])) + else: + messages.error(request, _("The page could not be saved due to validation errors")) + edit_handler = edit_handler_class(instance=page, form=form) errors_debug = ( repr(edit_handler.form.errors) From 1ebe234a7eebe761fdbf7bbbb1bc32480e840a85 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Wed, 16 Apr 2014 01:05:15 +0300 Subject: [PATCH 003/298] Add go_live_datetime handling on views/models The logic for publishing a page exists in the create and edit views of wagtailadmin.views.pages and in the publish methodd of hte PageRevision model. When a page is created and published (create view), if it has a go_live in the future then it will not be live but the revision that will be created will have the approved_go_live set to the corresponding datetime. If the page is just saved or submitted for moderation the normal flow will be followed. When a page is edited and published (edit view): * The approved_go_live_datetime will be cleared for all older revisions of that page. * If the edit has a go_live in the future then the new revision that will be crated will have the approved_go_live set to that datetime. Also the live attribute of the page will be set to False. If the page is edited and not published the normal flow will be followed. When a submitted for moderation page is published (publish method): * If it has a go_live in the future then the live attribute will be set to False, the approved_go_live_datetime of the revision will be set to the go_live_datetime of the page and the approved_go_live_datetime of all other revisions will be cleared. * If it does not have a go_live in the future then the page will be live and the approved_go_live_dattime of all other revisions will be cleard Finally, if a page is unpublished then then approved_go_live_datetime of all revisions of that page will be cleared. --- wagtail/wagtailadmin/views/pages.py | 44 +++++++++++++++++++++++++---- wagtail/wagtailcore/models.py | 32 ++++++++++++++++++--- 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 703d9f8dd..8193bdfc4 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -7,6 +7,7 @@ from django.contrib import messages from django.contrib.contenttypes.models import ContentType from django.contrib.auth.decorators import permission_required from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.utils import timezone from django.utils.translation import ugettext as _ from django.views.decorators.vary import vary_on_headers @@ -173,16 +174,31 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ is_publishing = bool(request.POST.get('action-publish')) and parent_page_perms.can_publish_subpage() is_submitting = bool(request.POST.get('action-submit')) + go_live_datetime = form.cleaned_data.get('go_live_datetime') + future_go_live = go_live_datetime and go_live_datetime > timezone.now() + approved_go_live_datetime = None - if is_publishing: + if is_publishing and not future_go_live: page.live = True page.has_unpublished_changes = False + elif is_publishing and future_go_live: + page.live = False + # Set approved_go_live_datetime only if is publishing + # and the future_go_live is actually in future + approved_go_live_datetime = go_live_datetime + page.has_unpublished_changes = False else: page.live = False page.has_unpublished_changes = True parent_page.add_child(page) # assign tree parameters - will cause page to be saved - page.save_revision(user=request.user, submitted_for_moderation=is_submitting) + + # Pass approved_go_live_datetime to save_revision + page.save_revision( + user=request.user, + submitted_for_moderation=is_submitting, + approved_go_live_datetime = approved_go_live_datetime + ) if is_publishing: messages.success(request, _("Page '{0}' published.").format(page.title)) @@ -245,12 +261,24 @@ def edit(request, page_id): if form.is_valid(): is_publishing = bool(request.POST.get('action-publish')) and page_perms.can_publish() is_submitting = bool(request.POST.get('action-submit')) + go_live_datetime = form.cleaned_data.get('go_live_datetime') + future_go_live = go_live_datetime and go_live_datetime > timezone.now() + approved_go_live_datetime = None if is_publishing: - page.live = True page.has_unpublished_changes = False + if future_go_live: + page.live = False + # Set approved_go_live_datetime only if publishing + approved_go_live_datetime = go_live_datetime + else: + page.live = True form.save() - page.revisions.update(submitted_for_moderation=False) + # Clear approved_go_live_datetime for older revisions + page.revisions.update( + submitted_for_moderation=False, + approved_go_live_datetime=None, + ) else: # not publishing the page if page.live: @@ -262,7 +290,11 @@ def edit(request, page_id): page.has_unpublished_changes = True form.save() - page.save_revision(user=request.user, submitted_for_moderation=is_submitting) + page.save_revision( + user=request.user, + submitted_for_moderation=is_submitting, + approved_go_live_datetime = approved_go_live_datetime + ) if is_publishing: messages.success(request, _("Page '{0}' published.").format(page.title)) @@ -443,6 +475,8 @@ def unpublish(request, page_id): parent_id = page.get_parent().id page.live = False page.save() + # Since page is unpublished clear the approved_go_live_datetime of all revisions + page.revisions.update(approved_go_live_datetime=None) messages.success(request, _("Page '{0}' unpublished.").format(page.title)) return redirect('wagtailadmin_explore', parent_id) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 96e670ef9..1ecdd1eb0 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -373,8 +373,13 @@ class Page(MP_Node, ClusterableModel, Indexed): else: raise Http404 - def save_revision(self, user=None, submitted_for_moderation=False): - self.revisions.create(content_json=self.to_json(), user=user, submitted_for_moderation=submitted_for_moderation) + def save_revision(self, user=None, submitted_for_moderation=False, approved_go_live_datetime=None): + self.revisions.create( + content_json=self.to_json(), + user=user, + submitted_for_moderation=submitted_for_moderation, + approved_go_live_datetime=approved_go_live_datetime, + ) def get_latest_revision(self): try: @@ -539,13 +544,20 @@ class Page(MP_Node, ClusterableModel, Indexed): @property def status_string(self): if not self.live: - return "draft" + if self.approved_schedule: + return "scheduled" + else: + return "draft" else: if self.has_unpublished_changes: return "live + draft" else: return "live" + @property + def approved_schedule(self): + return self.revisions.exclude(approved_go_live_datetime__isnull=True).exists() + def has_unpublished_subtree(self): """ An awkwardly-defined flag used in determining whether unprivileged editors have @@ -693,11 +705,23 @@ class PageRevision(models.Model): def publish(self): page = self.as_page_object() - page.live = True + if page.go_live_datetime and page.go_live_datetime > timezone.now(): + # if we have a go_live in the future don't make the page live + page.live = False + # Instead set the approved_go_live_datetime of this revision + self.approved_go_live_datetime = page.go_live_datetime + self.save() + # And clear the the approved_go_live_datetime of any other revisions + page.revisions.exclude(id=self.id).update(approved_go_live_datetime=None) + else: + page.live = True + # If page goes live clear the approved_go_live_datetime of all revisions + page.revisions.update(approved_go_live_datetime=None) page.save() self.submitted_for_moderation = False page.revisions.update(submitted_for_moderation=False) + PAGE_PERMISSION_TYPE_CHOICES = [ ('add', 'Add'), ('edit', 'Edit'), From 89f2d76bfdcd49cb9c132342b83e29fc29a8ac44 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Mon, 21 Apr 2014 18:03:57 +0300 Subject: [PATCH 004/298] Set expired = False when publishing pages both ... in views and models and refactor code a bit. --- wagtail/wagtailadmin/views/pages.py | 18 ++++++++++-------- wagtail/wagtailcore/models.py | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 8193bdfc4..7b181b5fd 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -178,15 +178,16 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ future_go_live = go_live_datetime and go_live_datetime > timezone.now() approved_go_live_datetime = None - if is_publishing and not future_go_live: - page.live = True - page.has_unpublished_changes = False - elif is_publishing and future_go_live: - page.live = False - # Set approved_go_live_datetime only if is publishing - # and the future_go_live is actually in future - approved_go_live_datetime = go_live_datetime + if is_publishing: page.has_unpublished_changes = False + page.expired = False + if future_go_live: + page.live = False + # Set approved_go_live_datetime only if is publishing + # and the future_go_live is actually in future + approved_go_live_datetime = go_live_datetime + else: + page.live = True else: page.live = False page.has_unpublished_changes = True @@ -267,6 +268,7 @@ def edit(request, page_id): if is_publishing: page.has_unpublished_changes = False + page.expired = False if future_go_live: page.live = False # Set approved_go_live_datetime only if publishing diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 1ecdd1eb0..eda1a91ec 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -717,6 +717,7 @@ class PageRevision(models.Model): page.live = True # If page goes live clear the approved_go_live_datetime of all revisions page.revisions.update(approved_go_live_datetime=None) + page.expired = False # When a page is published it can't be expired page.save() self.submitted_for_moderation = False page.revisions.update(submitted_for_moderation=False) From 792b37d9564e3ae32f0acccda9427740a6b4541f Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Mon, 21 Apr 2014 18:08:47 +0300 Subject: [PATCH 005/298] Add "expired" status to pages --- wagtail/wagtailcore/models.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index eda1a91ec..5348acf84 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -544,7 +544,9 @@ class Page(MP_Node, ClusterableModel, Indexed): @property def status_string(self): if not self.live: - if self.approved_schedule: + if self.expired: + return "expired" + elif self.approved_schedule: return "scheduled" else: return "draft" From 6839a7474ab32873bfffb2b48237d500538ca7c7 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Mon, 21 Apr 2014 21:48:23 +0300 Subject: [PATCH 006/298] Add management command for scheduled pages The publish_scheduled_pages management command does three actions: * Gets live pages which have an expiry_datetime that has passed and set expired = True and live = False * Gets all revisions on the moderation queue which have an expiry_datetime that has passed and remove them from the moderation queue * Gets all revisions that have an approved_go_live_datetime that has passed. For each one of them the publish() method of the revision is called which will perform the required actions for making live this version of the page. Finally, a dryrun parameter has been added to the management command. If this parameter is used then the pages that pass the tests for each of the above lists will be printed. --- .../commands/publish_scheduled_pages.py | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 wagtail/wagtailcore/management/commands/publish_scheduled_pages.py diff --git a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py new file mode 100644 index 000000000..0abf3c744 --- /dev/null +++ b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py @@ -0,0 +1,109 @@ +import datetime +import json +from optparse import make_option + +from django.core.management.base import BaseCommand +from django.utils import dateparse, timezone +from wagtail.wagtailcore.models import Page, PageRevision + + +def revision_date_expired(r): + expiry_str = json.loads(r.content_json).get('expiry_datetime') + if not expiry_str: + return False + expiry_datetime = dateparse.parse_datetime(expiry_str) + if expiry_datetime < timezone.now(): + return True + else: + return False + + +class Command(BaseCommand): + option_list = BaseCommand.option_list + ( + make_option( + '--dryrun', + action='store_true', + dest='dryrun', + default=False, + help='Dry run -- don\'t change anything.'), + ) + + def handle(self, *args, **options): + dryrun = False + if options['dryrun']: + print "Will do a dry run." + dryrun = True + + # 1. get all expired pages with live = True + expired_pages = Page.objects.filter( + live=True, + expiry_datetime__lt=timezone.now() + ) + if dryrun: + if expired_pages: + print "Expired pages to be deactivated:" + print "Expiry datetime\t\tSlug\t\tName" + print "---------------\t\t----\t\t----" + for ep in expired_pages: + print "{0}\t{1}\t{2}".format( + ep.expiry_datetime.strftime("%Y-%m-%d %H:%M"), + ep.slug, + ep.title + ) + else: + print "No expired pages to be deactivated found." + else: + expired_pages.update(expired=True, live=False) + + # 2. get all page revisions for moderation that have been expired + expired_revs = [ + r for r in PageRevision.objects.filter( + submitted_for_moderation=True + ) if revision_date_expired(r) + ] + if dryrun: + print "---------------------------------" + if expired_revs: + print "Expired revisions to be dropped from moderation queue:" + print "Expiry datetime\t\tSlug\t\tName" + print "---------------\t\t----\t\t----" + for er in expired_revs: + rev_data = json.loads(er.content_json) + print "{0}\t{1}\t{2}".format( + dateparse.parse_datetime( + rev_data.get('expiry_datetime') + ).strftime("%Y-%m-%d %H:%M"), + rev_data.get('slug'), + rev_data.get('title') + ) + else: + print "No expired revision to be dropped from moderation." + else: + for er in expired_revs: + er.submitted_for_moderation = False + er.save() + + # 3. get all revisions that need to be published + revs_for_publishing = PageRevision.objects.filter( + approved_go_live_datetime__lt=timezone.now() + ) + if dryrun: + print "---------------------------------" + if revs_for_publishing: + print "Revisions to be published:" + print "Go live datetime\t\tSlug\t\tName" + print "---------------\t\t\t----\t\t----" + for rp in revs_for_publishing: + rev_data = json.loads(rp.content_json) + print "{0}\t\t{1}\t{2}".format( + rp.approved_go_live_datetime.strftime("%Y-%m-%d %H:%M"), + rev_data.get('slug'), + rev_data.get('title') + ) + else: + print "No pages to go live." + else: + for rp in revs_for_publishing: + # just run publish for the revision -- since the approved go + # live datetime is before now it will make the page live + rp.publish() From 686a9beaa9099ac8f4cca20004f35321e6bdd09e Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Tue, 22 Apr 2014 20:12:20 +0300 Subject: [PATCH 007/298] Add tests for scheduled publishing This does not actually test the management command for scheduled pages. --- wagtail/wagtailadmin/tests.py | 140 ++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 6 deletions(-) diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py index 84b00b335..3df92ec22 100644 --- a/wagtail/wagtailadmin/tests.py +++ b/wagtail/wagtailadmin/tests.py @@ -1,8 +1,10 @@ +from datetime import datetime, timedelta +from django.utils import timezone from django.test import TestCase import unittest from wagtail.tests.models import SimplePage, EventPage from wagtail.tests.utils import login -from wagtail.wagtailcore.models import Page +from wagtail.wagtailcore.models import Page, PageRevision from django.core.urlresolvers import reverse @@ -49,7 +51,7 @@ class TestPageSelectTypeLocation(TestCase): response = self.client.get(reverse('wagtailadmin_pages_select_type')) self.assertEqual(response.status_code, 200) - @unittest.expectedFailure # For some reason, this returns a 302... + @unittest.expectedFailure # For some reason, this returns a 302... def test_select_location_testpage(self): response = self.client.get(reverse('wagtailadmin_pages_select_location', args=('tests', 'eventpage'))) self.assertEqual(response.status_code, 200) @@ -100,6 +102,57 @@ class TestPageCreation(TestCase): self.assertIsInstance(page, SimplePage) self.assertFalse(page.live) + def test_create_simplepage_scheduled(self): + go_live_datetime = timezone.now() + timedelta(days=1) + expiry_datetime = timezone.now() + timedelta(days=2) + post_data = { + 'title': "New page!", + 'content': "Some content", + 'slug': 'hello-world', + 'go_live_datetime': str(go_live_datetime), + 'expiry_datetime': str(expiry_datetime), + } + response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + # Find the page and check the scheduled times + page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific + self.assertEquals(page.go_live_datetime.date(), go_live_datetime.date()) + self.assertEquals(page.expiry_datetime.date(), expiry_datetime.date()) + self.assertEquals(page.expired, False) + self.assertTrue(page.status_string, "draft") + + # No revisions with approved_go_live_datetime + self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists()) + + def test_create_simplepage_scheduled_errored(self): + post_data = { + 'title': "New page!", + 'content': "Some content", + 'slug': 'hello-world', + 'go_live_datetime': str(timezone.now() + timedelta(days=2)), + 'expiry_datetime': str(timezone.now() + timedelta(days=1)), + } + response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 200) + self.assertTrue(response.context['edit_handler'].form.errors) + + post_data = { + 'title': "New page!", + 'content': "Some content", + 'slug': 'hello-world', + 'expiry_datetime': str(timezone.now() + timedelta(days=-1)), + } + response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 200) + self.assertTrue(response.context['edit_handler'].form.errors) + def test_create_simplepage_post_publish(self): post_data = { 'title': "New page!", @@ -118,6 +171,34 @@ class TestPageCreation(TestCase): self.assertIsInstance(page, SimplePage) self.assertTrue(page.live) + def test_create_simplepage_post_publish_scheduled(self): + go_live_datetime = timezone.now() + timedelta(days=1) + expiry_datetime = timezone.now() + timedelta(days=2) + post_data = { + 'title': "New page!", + 'content': "Some content", + 'slug': 'hello-world', + 'action-publish': "Publish", + 'go_live_datetime': str(go_live_datetime), + 'expiry_datetime': str(expiry_datetime), + } + response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + # Find the page and check it + page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific + self.assertEquals(page.go_live_datetime.date(), go_live_datetime.date()) + self.assertEquals(page.expiry_datetime.date(), expiry_datetime.date()) + self.assertEquals(page.expired, False) + + # A revision with approved_go_live_datetime should exist now + self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists()) + # But Page won't be live + self.assertFalse(page.live) + self.assertTrue(page.status_string, "scheduled") + def test_create_simplepage_post_existingslug(self): # This tests the existing slug checking on page save @@ -143,7 +224,7 @@ class TestPageCreation(TestCase): response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', 100000))) self.assertEqual(response.status_code, 404) - @unittest.expectedFailure # FIXME: Crashes! + @unittest.expectedFailure # FIXME: Crashes! def test_create_nonpagetype(self): response = self.client.get(reverse('wagtailadmin_pages_create', args=('wagtailimages', 'image', self.root_page.id))) self.assertEqual(response.status_code, 404) @@ -184,7 +265,7 @@ class TestPageEdit(TestCase): 'slug': 'hello-world', } response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) - + # Should be redirected to explorer page self.assertEqual(response.status_code, 302) @@ -192,6 +273,31 @@ class TestPageEdit(TestCase): child_page_new = SimplePage.objects.get(id=self.child_page.id) self.assertTrue(child_page_new.has_unpublished_changes) + def test_edit_post_scheduled(self): + go_live_datetime = timezone.now() + timedelta(days=1) + expiry_datetime = timezone.now() + timedelta(days=2) + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'go_live_datetime': str(go_live_datetime), + 'expiry_datetime': str(expiry_datetime), + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + child_page_new = SimplePage.objects.get(id=self.child_page.id) + + # The page will still be live + self.assertTrue(child_page_new.live) + # A revision with approved_go_live_datetime should not exist + self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) + # But a revision with go_live_datetime and expiry_datetime in their content json *should* exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_datetime.date())).exists()) + self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expiry_datetime.date())).exists()) + def test_edit_post_publish(self): # Tests publish from edit page post_data = { @@ -201,7 +307,7 @@ class TestPageEdit(TestCase): 'action-publish': "Publish", } response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) - + # Should be redirected to explorer page self.assertEqual(response.status_code, 302) @@ -212,6 +318,28 @@ class TestPageEdit(TestCase): # The page shouldn't have "has_unpublished_changes" flag set self.assertFalse(child_page_new.has_unpublished_changes) + def test_edit_post_publish_scheduled(self): + go_live_datetime = timezone.now() + timedelta(days=1) + expiry_datetime = timezone.now() + timedelta(days=2) + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'action-publish': "Publish", + 'go_live_datetime': str(go_live_datetime), + 'expiry_datetime': str(expiry_datetime), + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + child_page_new = SimplePage.objects.get(id=self.child_page.id) + # The page should not be live anymore + self.assertFalse(child_page_new.live) + # Instead a revision with approved_go_live_datetime should not exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) + class TestPageDelete(TestCase): def setUp(self): @@ -232,7 +360,7 @@ class TestPageDelete(TestCase): self.assertEqual(response.status_code, 200) def test_delete_post(self): - post_data = {'hello': 'world'} # For some reason, this test doesn't work without a bit of POST data + post_data = {'hello': 'world'} # For some reason, this test doesn't work without a bit of POST data response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )), post_data) # Should be redirected to explorer page From 65f093061dc53abf24f9bb30b0be1d6160a4c0f6 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Wed, 23 Apr 2014 11:56:13 +0300 Subject: [PATCH 008/298] Use the plain DateTimeInput widget for ... go_live_datetime and expiry_datetime. This should probably be improved in order to use a javascript datetime picker. --- wagtail/wagtailadmin/edit_handlers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 245f7ad60..370f2f5bb 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -133,15 +133,18 @@ class LocalizedTimeField(forms.CharField): else: raise ValidationError(_("Please type a valid time") ) - +# For some reason we need to explicitly override the DateTimeField and set +# it to use the DateTimeInput or else it will use the LocalizedDateInput/FriendlyDateInput if hasattr(settings, 'USE_L10N') and settings.USE_L10N==True: FORM_FIELD_OVERRIDES = { models.DateField: {'widget': LocalizedDateInput}, + models.DateTimeField: {'widget': forms.DateTimeInput}, models.TimeField: {'widget': LocalizedTimeInput, 'form_class': LocalizedTimeField}, } else: # Fall back to friendly date/time FORM_FIELD_OVERRIDES = { models.DateField: {'widget': FriendlyDateInput}, + models.DateTimeField: {'widget': forms.DateTimeInput}, models.TimeField: {'widget': FriendlyTimeInput, 'form_class': FriendlyTimeField}, } From 9511b21ea73cf86958c8221eec212bd04c18198d Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Sun, 25 May 2014 22:07:59 +0300 Subject: [PATCH 009/298] Test publish scheduled pages management command --- wagtail/wagtailadmin/tests.py | 154 +++++++++++++++++++++++++++++++++- 1 file changed, 151 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py index 3df92ec22..04bf38f76 100644 --- a/wagtail/wagtailadmin/tests.py +++ b/wagtail/wagtailadmin/tests.py @@ -1,11 +1,13 @@ from datetime import datetime, timedelta +from django.core import management +from django.core.urlresolvers import reverse from django.utils import timezone from django.test import TestCase import unittest +from StringIO import StringIO from wagtail.tests.models import SimplePage, EventPage from wagtail.tests.utils import login from wagtail.wagtailcore.models import Page, PageRevision -from django.core.urlresolvers import reverse class TestHome(TestCase): @@ -127,7 +129,7 @@ class TestPageCreation(TestCase): # No revisions with approved_go_live_datetime self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists()) - def test_create_simplepage_scheduled_errored(self): + def test_create_simplepage_scheduled_go_live_before_expiry(self): post_data = { 'title': "New page!", 'content': "Some content", @@ -141,6 +143,7 @@ class TestPageCreation(TestCase): self.assertEqual(response.status_code, 200) self.assertTrue(response.context['edit_handler'].form.errors) + def test_create_simplepage_scheduled_expire_in_the_past(self): post_data = { 'title': "New page!", 'content': "Some content", @@ -337,9 +340,51 @@ class TestPageEdit(TestCase): child_page_new = SimplePage.objects.get(id=self.child_page.id) # The page should not be live anymore self.assertFalse(child_page_new.live) - # Instead a revision with approved_go_live_datetime should not exist + # Instead a revision with approved_go_live_datetime should now exist self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) + def test_edit_post_publish_now_an_already_scheduled(self): + # First let's publish a page with a go_live_datetime in the future + go_live_datetime = timezone.now() + timedelta(days=1) + expiry_datetime = timezone.now() + timedelta(days=2) + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'action-publish': "Publish", + 'go_live_datetime': str(go_live_datetime), + 'expiry_datetime': str(expiry_datetime), + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + child_page_new = SimplePage.objects.get(id=self.child_page.id) + # The page should not be live anymore + self.assertFalse(child_page_new.live) + # Instead a revision with approved_go_live_datetime should now exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) + + # Now, let's edit it and publish it right now + go_live_datetime = timezone.now() + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'action-publish': "Publish", + 'go_live_datetime': "", + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + child_page_new = SimplePage.objects.get(id=self.child_page.id) + # The page should be live now + self.assertTrue(child_page_new.live) + # And a revision with approved_go_live_datetime should not exist + self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) class TestPageDelete(TestCase): def setUp(self): @@ -454,3 +499,106 @@ class TestEditorHooks(TestCase): self.assertEqual(response.status_code, 200) self.assertContains(response, '') self.assertContains(response, '') + +class TestPublishScheduledPages(TestCase): + def setUp(self): + # Find root page + self.root_page = Page.objects.get(id=2) + + def test_go_live_page_will_be_published(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = False + page.go_live_datetime = timezone.now() - timedelta(days=1) + self.root_page.add_child(page) + + page.save_revision( + approved_go_live_datetime = timezone.now() - timedelta(days=1) + ) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + management.call_command('publish_scheduled_pages', verbosity=3, interactive=False) + #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + + def test_go_live_page_will_be_published(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = False + page.go_live_datetime = timezone.now() - timedelta(days=1) + self.root_page.add_child(page) + + page.save_revision(approved_go_live_datetime = timezone.now() - timedelta(days=1)) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + + def test_future_go_live_page_will_not_be_published(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = False + page.go_live_datetime = timezone.now() + timedelta(days=1) + self.root_page.add_child(page) + page.save_revision(approved_go_live_datetime = timezone.now() - timedelta(days=1)) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + + def test_expired_page_will_be_unpublished(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = True + page.expiry_datetime = timezone.now() - timedelta(days=1) + self.root_page.add_child(page) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(p.expired) + + def test_future_expired_page_will_not_be_unpublished(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = True + page.expiry_datetime = timezone.now() + timedelta(days=1) + self.root_page.add_child(page) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + self.assertFalse(p.expired) + + def test_expired_pages_are_dropped_from_mod_queue(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = False + page.expiry_datetime = timezone.now() - timedelta(days=1) + self.root_page.add_child(page) + page.save_revision(submitted_for_moderation = True) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists()) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertFalse(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists()) + + From 8dfd0c623f7dfa954e7f5c6307da06213932e4e7 Mon Sep 17 00:00:00 2001 From: Serafeim Papastefanos Date: Thu, 29 May 2014 19:03:19 +0300 Subject: [PATCH 010/298] Add help_text mssage to scheduled publisihing ... datetime fields (go_live_datetime and expiry_datetime) to help users fill them since no datetim control is available. --- wagtail/wagtailcore/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 5bdf1c373..434b174b6 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -235,8 +235,8 @@ class Page(MP_Node, ClusterableModel, Indexed): show_in_menus = models.BooleanField(default=False, help_text=_("Whether a link to this page will appear in automatically generated menus")) search_description = models.TextField(blank=True) - go_live_datetime = models.DateTimeField(verbose_name=_("Go live date/time"), blank=True, null=True) - expiry_datetime = models.DateTimeField(verbose_name=_("Expiry date/time"), blank=True, null=True) + go_live_datetime = models.DateTimeField(verbose_name=_("Go live date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True) + expiry_datetime = models.DateTimeField(verbose_name=_("Expiry date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True) expired = models.BooleanField(default=False, editable=False) indexed_fields = { From 3fa98ef82ed60a622943e54994b819da21841fee Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 3 Jun 2014 10:21:21 +0100 Subject: [PATCH 011/298] Renamed scheduled publishing fields --- wagtail/wagtailadmin/tests.py | 120 +++++++++--------- wagtail/wagtailadmin/views/pages.py | 34 ++--- .../commands/publish_scheduled_pages.py | 16 +-- .../0003_fields_for_scheduled_publishing.py | 30 ++--- wagtail/wagtailcore/models.py | 32 ++--- 5 files changed, 116 insertions(+), 116 deletions(-) diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py index 3bddc864c..4d6016609 100644 --- a/wagtail/wagtailadmin/tests.py +++ b/wagtail/wagtailadmin/tests.py @@ -78,14 +78,14 @@ class TestPageCreation(TestCase): self.assertFalse(page.live) def test_create_simplepage_scheduled(self): - go_live_datetime = timezone.now() + timedelta(days=1) - expiry_datetime = timezone.now() + timedelta(days=2) + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) post_data = { 'title': "New page!", 'content': "Some content", 'slug': 'hello-world', - 'go_live_datetime': str(go_live_datetime).split('.')[0], - 'expiry_datetime': str(expiry_datetime).split('.')[0], + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], } response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) @@ -94,21 +94,21 @@ class TestPageCreation(TestCase): # Find the page and check the scheduled times page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific - self.assertEquals(page.go_live_datetime.date(), go_live_datetime.date()) - self.assertEquals(page.expiry_datetime.date(), expiry_datetime.date()) + self.assertEquals(page.go_live_at.date(), go_live_at.date()) + self.assertEquals(page.expire_at.date(), expire_at.date()) self.assertEquals(page.expired, False) self.assertTrue(page.status_string, "draft") - # No revisions with approved_go_live_datetime - self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists()) + # No revisions with approved_go_live_at + self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists()) def test_create_simplepage_scheduled_go_live_before_expiry(self): post_data = { 'title': "New page!", 'content': "Some content", 'slug': 'hello-world', - 'go_live_datetime': str(timezone.now() + timedelta(days=2)).split('.')[0], - 'expiry_datetime': str(timezone.now() + timedelta(days=1)).split('.')[0], + 'go_live_at': str(timezone.now() + timedelta(days=2)).split('.')[0], + 'expire_at': str(timezone.now() + timedelta(days=1)).split('.')[0], } response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) @@ -121,7 +121,7 @@ class TestPageCreation(TestCase): 'title': "New page!", 'content': "Some content", 'slug': 'hello-world', - 'expiry_datetime': str(timezone.now() + timedelta(days=-1)).split('.')[0], + 'expire_at': str(timezone.now() + timedelta(days=-1)).split('.')[0], } response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) @@ -148,15 +148,15 @@ class TestPageCreation(TestCase): self.assertTrue(page.live) def test_create_simplepage_post_publish_scheduled(self): - go_live_datetime = timezone.now() + timedelta(days=1) - expiry_datetime = timezone.now() + timedelta(days=2) + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) post_data = { 'title': "New page!", 'content': "Some content", 'slug': 'hello-world', 'action-publish': "Publish", - 'go_live_datetime': str(go_live_datetime).split('.')[0], - 'expiry_datetime': str(expiry_datetime).split('.')[0], + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], } response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) @@ -165,12 +165,12 @@ class TestPageCreation(TestCase): # Find the page and check it page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific - self.assertEquals(page.go_live_datetime.date(), go_live_datetime.date()) - self.assertEquals(page.expiry_datetime.date(), expiry_datetime.date()) + self.assertEquals(page.go_live_at.date(), go_live_at.date()) + self.assertEquals(page.expire_at.date(), expire_at.date()) self.assertEquals(page.expired, False) - # A revision with approved_go_live_datetime should exist now - self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_datetime__isnull=True).exists()) + # A revision with approved_go_live_at should exist now + self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists()) # But Page won't be live self.assertFalse(page.live) self.assertTrue(page.status_string, "scheduled") @@ -250,14 +250,14 @@ class TestPageEdit(TestCase): self.assertTrue(child_page_new.has_unpublished_changes) def test_edit_post_scheduled(self): - go_live_datetime = timezone.now() + timedelta(days=1) - expiry_datetime = timezone.now() + timedelta(days=2) + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) post_data = { 'title': "I've been edited!", 'content': "Some content", 'slug': 'hello-world', - 'go_live_datetime': str(go_live_datetime).split('.')[0], - 'expiry_datetime': str(expiry_datetime).split('.')[0], + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], } response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) @@ -268,11 +268,11 @@ class TestPageEdit(TestCase): # The page will still be live self.assertTrue(child_page_new.live) - # A revision with approved_go_live_datetime should not exist - self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) - # But a revision with go_live_datetime and expiry_datetime in their content json *should* exist - self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_datetime.date())).exists()) - self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expiry_datetime.date())).exists()) + # A revision with approved_go_live_at should not exist + self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) + # But a revision with go_live_at and expire_at in their content json *should* exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_at.date())).exists()) + self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expire_at.date())).exists()) def test_edit_post_publish(self): # Tests publish from edit page @@ -295,15 +295,15 @@ class TestPageEdit(TestCase): self.assertFalse(child_page_new.has_unpublished_changes) def test_edit_post_publish_scheduled(self): - go_live_datetime = timezone.now() + timedelta(days=1) - expiry_datetime = timezone.now() + timedelta(days=2) + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) post_data = { 'title': "I've been edited!", 'content': "Some content", 'slug': 'hello-world', 'action-publish': "Publish", - 'go_live_datetime': str(go_live_datetime).split('.')[0], - 'expiry_datetime': str(expiry_datetime).split('.')[0], + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], } response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) @@ -313,20 +313,20 @@ class TestPageEdit(TestCase): child_page_new = SimplePage.objects.get(id=self.child_page.id) # The page should not be live anymore self.assertFalse(child_page_new.live) - # Instead a revision with approved_go_live_datetime should now exist - self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) + # Instead a revision with approved_go_live_at should now exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) def test_edit_post_publish_now_an_already_scheduled(self): - # First let's publish a page with a go_live_datetime in the future - go_live_datetime = timezone.now() + timedelta(days=1) - expiry_datetime = timezone.now() + timedelta(days=2) + # First let's publish a page with a go_live_at in the future + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) post_data = { 'title': "I've been edited!", 'content': "Some content", 'slug': 'hello-world', 'action-publish': "Publish", - 'go_live_datetime': str(go_live_datetime).split('.')[0], - 'expiry_datetime': str(expiry_datetime).split('.')[0], + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], } response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) @@ -336,17 +336,17 @@ class TestPageEdit(TestCase): child_page_new = SimplePage.objects.get(id=self.child_page.id) # The page should not be live anymore self.assertFalse(child_page_new.live) - # Instead a revision with approved_go_live_datetime should now exist - self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) + # Instead a revision with approved_go_live_at should now exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) # Now, let's edit it and publish it right now - go_live_datetime = timezone.now() + go_live_at = timezone.now() post_data = { 'title': "I've been edited!", 'content': "Some content", 'slug': 'hello-world', 'action-publish': "Publish", - 'go_live_datetime': "", + 'go_live_at': "", } response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) @@ -356,8 +356,8 @@ class TestPageEdit(TestCase): child_page_new = SimplePage.objects.get(id=self.child_page.id) # The page should be live now self.assertTrue(child_page_new.live) - # And a revision with approved_go_live_datetime should not exist - self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_datetime__isnull=True).exists()) + # And a revision with approved_go_live_at should not exist + self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) class TestPageDelete(TestCase): def setUp(self): @@ -483,60 +483,60 @@ class TestPublishScheduledPages(TestCase): page.title = "Hello world!" page.slug = "hello-world" page.live = False - page.go_live_datetime = timezone.now() - timedelta(days=1) + page.go_live_at = timezone.now() - timedelta(days=1) self.root_page.add_child(instance=page) page.save_revision( - approved_go_live_datetime = timezone.now() - timedelta(days=1) + approved_go_live_at = timezone.now() - timedelta(days=1) ) p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) management.call_command('publish_scheduled_pages', verbosity=3, interactive=False) #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False) p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) - self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) def test_go_live_page_will_be_published(self): page = SimplePage() page.title = "Hello world!" page.slug = "hello-world" page.live = False - page.go_live_datetime = timezone.now() - timedelta(days=1) + page.go_live_at = timezone.now() - timedelta(days=1) self.root_page.add_child(instance=page) - page.save_revision(approved_go_live_datetime = timezone.now() - timedelta(days=1)) + page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1)) p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) management.call_command('publish_scheduled_pages', ) p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) - self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) def test_future_go_live_page_will_not_be_published(self): page = SimplePage() page.title = "Hello world!" page.slug = "hello-world" page.live = False - page.go_live_datetime = timezone.now() + timedelta(days=1) + page.go_live_at = timezone.now() + timedelta(days=1) self.root_page.add_child(instance=page) - page.save_revision(approved_go_live_datetime = timezone.now() - timedelta(days=1)) + page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1)) p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) management.call_command('publish_scheduled_pages', ) p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_datetime__isnull=True).exists()) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) def test_expired_page_will_be_unpublished(self): page = SimplePage() page.title = "Hello world!" page.slug = "hello-world" page.live = True - page.expiry_datetime = timezone.now() - timedelta(days=1) + page.expire_at = timezone.now() - timedelta(days=1) self.root_page.add_child(instance=page) p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) @@ -550,7 +550,7 @@ class TestPublishScheduledPages(TestCase): page.title = "Hello world!" page.slug = "hello-world" page.live = True - page.expiry_datetime = timezone.now() + timedelta(days=1) + page.expire_at = timezone.now() + timedelta(days=1) self.root_page.add_child(instance=page) p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) @@ -564,7 +564,7 @@ class TestPublishScheduledPages(TestCase): page.title = "Hello world!" page.slug = "hello-world" page.live = False - page.expiry_datetime = timezone.now() - timedelta(days=1) + page.expire_at = timezone.now() - timedelta(days=1) self.root_page.add_child(instance=page) page.save_revision(submitted_for_moderation = True) p = Page.objects.get(slug='hello-world') diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 26ab715ec..f4ea960ff 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -133,18 +133,18 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ is_publishing = bool(request.POST.get('action-publish')) and parent_page_perms.can_publish_subpage() is_submitting = bool(request.POST.get('action-submit')) - go_live_datetime = form.cleaned_data.get('go_live_datetime') - future_go_live = go_live_datetime and go_live_datetime > timezone.now() - approved_go_live_datetime = None + go_live_at = form.cleaned_data.get('go_live_at') + future_go_live = go_live_at and go_live_at > timezone.now() + approved_go_live_at = None if is_publishing: page.has_unpublished_changes = False page.expired = False if future_go_live: page.live = False - # Set approved_go_live_datetime only if is publishing + # Set approved_go_live_at only if is publishing # and the future_go_live is actually in future - approved_go_live_datetime = go_live_datetime + approved_go_live_at = go_live_at else: page.live = True else: @@ -153,11 +153,11 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ parent_page.add_child(instance=page) # assign tree parameters - will cause page to be saved - # Pass approved_go_live_datetime to save_revision + # Pass approved_go_live_at to save_revision page.save_revision( user=request.user, submitted_for_moderation=is_submitting, - approved_go_live_datetime = approved_go_live_datetime + approved_go_live_at = approved_go_live_at ) if is_publishing: @@ -222,24 +222,24 @@ def edit(request, page_id): if form.is_valid(): is_publishing = bool(request.POST.get('action-publish')) and page_perms.can_publish() is_submitting = bool(request.POST.get('action-submit')) - go_live_datetime = form.cleaned_data.get('go_live_datetime') - future_go_live = go_live_datetime and go_live_datetime > timezone.now() - approved_go_live_datetime = None + go_live_at = form.cleaned_data.get('go_live_at') + future_go_live = go_live_at and go_live_at > timezone.now() + approved_go_live_at = None if is_publishing: page.has_unpublished_changes = False page.expired = False if future_go_live: page.live = False - # Set approved_go_live_datetime only if publishing - approved_go_live_datetime = go_live_datetime + # Set approved_go_live_at only if publishing + approved_go_live_at = go_live_at else: page.live = True form.save() - # Clear approved_go_live_datetime for older revisions + # Clear approved_go_live_at for older revisions page.revisions.update( submitted_for_moderation=False, - approved_go_live_datetime=None, + approved_go_live_at=None, ) else: # not publishing the page @@ -255,7 +255,7 @@ def edit(request, page_id): page.save_revision( user=request.user, submitted_for_moderation=is_submitting, - approved_go_live_datetime = approved_go_live_datetime + approved_go_live_at = approved_go_live_at ) if is_publishing: @@ -455,8 +455,8 @@ def unpublish(request, page_id): parent_id = page.get_parent().id page.live = False page.save() - # Since page is unpublished clear the approved_go_live_datetime of all revisions - page.revisions.update(approved_go_live_datetime=None) + # Since page is unpublished clear the approved_go_live_at of all revisions + page.revisions.update(approved_go_live_at=None) messages.success(request, _("Page '{0}' unpublished.").format(page.title)) return redirect('wagtailadmin_explore', parent_id) diff --git a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py index 0abf3c744..b80ace728 100644 --- a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py +++ b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py @@ -8,11 +8,11 @@ from wagtail.wagtailcore.models import Page, PageRevision def revision_date_expired(r): - expiry_str = json.loads(r.content_json).get('expiry_datetime') + expiry_str = json.loads(r.content_json).get('expire_at') if not expiry_str: return False - expiry_datetime = dateparse.parse_datetime(expiry_str) - if expiry_datetime < timezone.now(): + expire_at = dateparse.parse_datetime(expiry_str) + if expire_at < timezone.now(): return True else: return False @@ -37,7 +37,7 @@ class Command(BaseCommand): # 1. get all expired pages with live = True expired_pages = Page.objects.filter( live=True, - expiry_datetime__lt=timezone.now() + expire_at__lt=timezone.now() ) if dryrun: if expired_pages: @@ -46,7 +46,7 @@ class Command(BaseCommand): print "---------------\t\t----\t\t----" for ep in expired_pages: print "{0}\t{1}\t{2}".format( - ep.expiry_datetime.strftime("%Y-%m-%d %H:%M"), + ep.expire_at.strftime("%Y-%m-%d %H:%M"), ep.slug, ep.title ) @@ -71,7 +71,7 @@ class Command(BaseCommand): rev_data = json.loads(er.content_json) print "{0}\t{1}\t{2}".format( dateparse.parse_datetime( - rev_data.get('expiry_datetime') + rev_data.get('expire_at') ).strftime("%Y-%m-%d %H:%M"), rev_data.get('slug'), rev_data.get('title') @@ -85,7 +85,7 @@ class Command(BaseCommand): # 3. get all revisions that need to be published revs_for_publishing = PageRevision.objects.filter( - approved_go_live_datetime__lt=timezone.now() + approved_go_live_at__lt=timezone.now() ) if dryrun: print "---------------------------------" @@ -96,7 +96,7 @@ class Command(BaseCommand): for rp in revs_for_publishing: rev_data = json.loads(rp.content_json) print "{0}\t\t{1}\t{2}".format( - rp.approved_go_live_datetime.strftime("%Y-%m-%d %H:%M"), + rp.approved_go_live_at.strftime("%Y-%m-%d %H:%M"), rev_data.get('slug'), rev_data.get('title') ) diff --git a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py b/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py index 5e682aa59..639068c2b 100644 --- a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py +++ b/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py @@ -8,18 +8,18 @@ from django.db import models class Migration(SchemaMigration): def forwards(self, orm): - # Adding field 'PageRevision.approved_go_live_datetime' - db.add_column(u'wagtailcore_pagerevision', 'approved_go_live_datetime', + # Adding field 'PageRevision.approved_go_live_at' + db.add_column(u'wagtailcore_pagerevision', 'approved_go_live_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), keep_default=False) - # Adding field 'Page.go_live_datetime' - db.add_column(u'wagtailcore_page', 'go_live_datetime', + # Adding field 'Page.go_live_at' + db.add_column(u'wagtailcore_page', 'go_live_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), keep_default=False) - # Adding field 'Page.expiry_datetime' - db.add_column(u'wagtailcore_page', 'expiry_datetime', + # Adding field 'Page.expire_at' + db.add_column(u'wagtailcore_page', 'expire_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), keep_default=False) @@ -30,14 +30,14 @@ class Migration(SchemaMigration): def backwards(self, orm): - # Deleting field 'PageRevision.approved_go_live_datetime' - db.delete_column(u'wagtailcore_pagerevision', 'approved_go_live_datetime') + # Deleting field 'PageRevision.approved_go_live_at' + db.delete_column(u'wagtailcore_pagerevision', 'approved_go_live_at') - # Deleting field 'Page.go_live_datetime' - db.delete_column(u'wagtailcore_page', 'go_live_datetime') + # Deleting field 'Page.go_live_at' + db.delete_column(u'wagtailcore_page', 'go_live_at') - # Deleting field 'Page.expiry_datetime' - db.delete_column(u'wagtailcore_page', 'expiry_datetime') + # Deleting field 'Page.expire_at' + db.delete_column(u'wagtailcore_page', 'expire_at') # Deleting field 'Page.expired' db.delete_column(u'wagtailcore_page', 'expired') @@ -92,8 +92,8 @@ class Migration(SchemaMigration): 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'expiry_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'go_live_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), @@ -109,7 +109,7 @@ class Migration(SchemaMigration): }, u'wagtailcore.pagerevision': { 'Meta': {'object_name': 'PageRevision'}, - 'approved_go_live_datetime': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'approved_go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), 'content_json': ('django.db.models.fields.TextField', [], {}), 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 434b174b6..3b2b055bd 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -235,8 +235,8 @@ class Page(MP_Node, ClusterableModel, Indexed): show_in_menus = models.BooleanField(default=False, help_text=_("Whether a link to this page will appear in automatically generated menus")) search_description = models.TextField(blank=True) - go_live_datetime = models.DateTimeField(verbose_name=_("Go live date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True) - expiry_datetime = models.DateTimeField(verbose_name=_("Expiry date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True) + go_live_at = models.DateTimeField(verbose_name=_("Go live date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True) + expire_at = models.DateTimeField(verbose_name=_("Expiry date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True) expired = models.BooleanField(default=False, editable=False) indexed_fields = { @@ -382,12 +382,12 @@ class Page(MP_Node, ClusterableModel, Indexed): else: raise Http404 - def save_revision(self, user=None, submitted_for_moderation=False, approved_go_live_datetime=None): + def save_revision(self, user=None, submitted_for_moderation=False, approved_go_live_at=None): self.revisions.create( content_json=self.to_json(), user=user, submitted_for_moderation=submitted_for_moderation, - approved_go_live_datetime=approved_go_live_datetime, + approved_go_live_at=approved_go_live_at, ) def get_latest_revision(self): @@ -472,11 +472,11 @@ class Page(MP_Node, ClusterableModel, Indexed): def clean(self): super(Page, self).clean() - if self.go_live_datetime and self.expiry_datetime: - if self.go_live_datetime > self.expiry_datetime: + if self.go_live_at and self.expire_at: + if self.go_live_at > self.expire_at: raise ValidationError(ugettext('Go live date/time should be before expiry datetime.')) - if self.expiry_datetime and self.expiry_datetime < timezone.now(): + if self.expire_at and self.expire_at < timezone.now(): raise ValidationError(ugettext('Expiry date/time should be in the future')) @classmethod @@ -567,7 +567,7 @@ class Page(MP_Node, ClusterableModel, Indexed): @property def approved_schedule(self): - return self.revisions.exclude(approved_go_live_datetime__isnull=True).exists() + return self.revisions.exclude(approved_go_live_at__isnull=True).exists() def has_unpublished_subtree(self): """ @@ -742,7 +742,7 @@ class PageRevision(models.Model): created_at = models.DateTimeField(auto_now_add=True) user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True) content_json = models.TextField() - approved_go_live_datetime = models.DateTimeField(null=True, blank=True) + approved_go_live_at = models.DateTimeField(null=True, blank=True) objects = models.Manager() submitted_revisions = SubmittedRevisionsManager() @@ -776,18 +776,18 @@ class PageRevision(models.Model): def publish(self): page = self.as_page_object() - if page.go_live_datetime and page.go_live_datetime > timezone.now(): + if page.go_live_at and page.go_live_at > timezone.now(): # if we have a go_live in the future don't make the page live page.live = False - # Instead set the approved_go_live_datetime of this revision - self.approved_go_live_datetime = page.go_live_datetime + # Instead set the approved_go_live_at of this revision + self.approved_go_live_at = page.go_live_at self.save() - # And clear the the approved_go_live_datetime of any other revisions - page.revisions.exclude(id=self.id).update(approved_go_live_datetime=None) + # And clear the the approved_go_live_at of any other revisions + page.revisions.exclude(id=self.id).update(approved_go_live_at=None) else: page.live = True - # If page goes live clear the approved_go_live_datetime of all revisions - page.revisions.update(approved_go_live_datetime=None) + # If page goes live clear the approved_go_live_at of all revisions + page.revisions.update(approved_go_live_at=None) page.expired = False # When a page is published it can't be expired page.save() self.submitted_for_moderation = False From ad3c62fed520b086ffd6ccf97779bd29af0cbff2 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 3 Jun 2014 10:22:14 +0100 Subject: [PATCH 012/298] Added go_live_at and expire_at to common page configuration --- wagtail/wagtailadmin/edit_handlers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 370f2f5bb..097b5bb21 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -731,5 +731,7 @@ Page.promote_panels = [ FieldPanel('seo_title'), FieldPanel('show_in_menus'), FieldPanel('search_description'), + FieldPanel('go_live_at'), + FieldPanel('expire_at'), ], ugettext_lazy('Common page configuration')), ] From 97ab613f88ab742c57400f0985d73b62be341635 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 3 Jun 2014 10:28:00 +0100 Subject: [PATCH 013/298] Moved tests for publish pages command into wagtailcore --- wagtail/wagtailadmin/tests.py | 107 +-------------------------------- wagtail/wagtailcore/tests.py | 109 +++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py index 4d6016609..c657c1efb 100644 --- a/wagtail/wagtailadmin/tests.py +++ b/wagtail/wagtailadmin/tests.py @@ -1,12 +1,10 @@ -from datetime import datetime, timedelta -from django.core import management +from datetime import timedelta from django.core.urlresolvers import reverse from django.utils import timezone from django.test import TestCase from wagtail.tests.models import SimplePage, EventPage from wagtail.tests.utils import login, unittest from wagtail.wagtailcore.models import Page, PageRevision -from django.core.urlresolvers import reverse class TestHome(TestCase): @@ -472,106 +470,3 @@ class TestEditorHooks(TestCase): self.assertEqual(response.status_code, 200) self.assertContains(response, '') self.assertContains(response, '') - -class TestPublishScheduledPages(TestCase): - def setUp(self): - # Find root page - self.root_page = Page.objects.get(id=2) - - def test_go_live_page_will_be_published(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = False - page.go_live_at = timezone.now() - timedelta(days=1) - self.root_page.add_child(instance=page) - - page.save_revision( - approved_go_live_at = timezone.now() - timedelta(days=1) - ) - p = Page.objects.get(slug='hello-world') - self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - management.call_command('publish_scheduled_pages', verbosity=3, interactive=False) - #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False) - p = Page.objects.get(slug='hello-world') - self.assertTrue(p.live) - self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - - def test_go_live_page_will_be_published(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = False - page.go_live_at = timezone.now() - timedelta(days=1) - self.root_page.add_child(instance=page) - - page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1)) - p = Page.objects.get(slug='hello-world') - self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - management.call_command('publish_scheduled_pages', ) - p = Page.objects.get(slug='hello-world') - self.assertTrue(p.live) - self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - - def test_future_go_live_page_will_not_be_published(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = False - page.go_live_at = timezone.now() + timedelta(days=1) - self.root_page.add_child(instance=page) - page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1)) - p = Page.objects.get(slug='hello-world') - self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - management.call_command('publish_scheduled_pages', ) - p = Page.objects.get(slug='hello-world') - self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - - def test_expired_page_will_be_unpublished(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = True - page.expire_at = timezone.now() - timedelta(days=1) - self.root_page.add_child(instance=page) - p = Page.objects.get(slug='hello-world') - self.assertTrue(p.live) - management.call_command('publish_scheduled_pages', ) - p = Page.objects.get(slug='hello-world') - self.assertFalse(p.live) - self.assertTrue(p.expired) - - def test_future_expired_page_will_not_be_unpublished(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = True - page.expire_at = timezone.now() + timedelta(days=1) - self.root_page.add_child(instance=page) - p = Page.objects.get(slug='hello-world') - self.assertTrue(p.live) - management.call_command('publish_scheduled_pages', ) - p = Page.objects.get(slug='hello-world') - self.assertTrue(p.live) - self.assertFalse(p.expired) - - def test_expired_pages_are_dropped_from_mod_queue(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = False - page.expire_at = timezone.now() - timedelta(days=1) - self.root_page.add_child(instance=page) - page.save_revision(submitted_for_moderation = True) - p = Page.objects.get(slug='hello-world') - self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists()) - management.call_command('publish_scheduled_pages', ) - p = Page.objects.get(slug='hello-world') - self.assertFalse(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists()) - - diff --git a/wagtail/wagtailcore/tests.py b/wagtail/wagtailcore/tests.py index 1b12c1025..3eede0e4a 100644 --- a/wagtail/wagtailcore/tests.py +++ b/wagtail/wagtailcore/tests.py @@ -1,9 +1,12 @@ +from datetime import timedelta + from django.test import TestCase, Client from django.http import HttpRequest, Http404 - +from django.utils import timezone from django.contrib.auth.models import User +from django.core import management -from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy +from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy, PageRevision from wagtail.tests.models import EventPage, EventIndex, SimplePage @@ -776,3 +779,105 @@ class TestIssue157(TestCase): # Check url self.assertEqual(homepage.url, '/') + + +class TestPublishScheduledPagesCommand(TestCase): + def setUp(self): + # Find root page + self.root_page = Page.objects.get(id=2) + + def test_go_live_page_will_be_published(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = False + page.go_live_at = timezone.now() - timedelta(days=1) + self.root_page.add_child(instance=page) + + page.save_revision( + approved_go_live_at = timezone.now() - timedelta(days=1) + ) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) + management.call_command('publish_scheduled_pages', verbosity=3, interactive=False) + #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) + + def test_go_live_page_will_be_published(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = False + page.go_live_at = timezone.now() - timedelta(days=1) + self.root_page.add_child(instance=page) + + page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1)) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) + + def test_future_go_live_page_will_not_be_published(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = False + page.go_live_at = timezone.now() + timedelta(days=1) + self.root_page.add_child(instance=page) + page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1)) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) + + def test_expired_page_will_be_unpublished(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = True + page.expire_at = timezone.now() - timedelta(days=1) + self.root_page.add_child(instance=page) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(p.expired) + + def test_future_expired_page_will_not_be_unpublished(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = True + page.expire_at = timezone.now() + timedelta(days=1) + self.root_page.add_child(instance=page) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertTrue(p.live) + self.assertFalse(p.expired) + + def test_expired_pages_are_dropped_from_mod_queue(self): + page = SimplePage() + page.title = "Hello world!" + page.slug = "hello-world" + page.live = False + page.expire_at = timezone.now() - timedelta(days=1) + self.root_page.add_child(instance=page) + page.save_revision(submitted_for_moderation = True) + p = Page.objects.get(slug='hello-world') + self.assertFalse(p.live) + self.assertTrue(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists()) + management.call_command('publish_scheduled_pages', ) + p = Page.objects.get(slug='hello-world') + self.assertFalse(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists()) From e530531cb9be2c2b398ce374b73294eca27d1eeb Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 3 Jun 2014 10:37:39 +0100 Subject: [PATCH 014/298] Cleanup of scheduled publishing tests --- wagtail/wagtailadmin/tests.py | 11 ++++ wagtail/wagtailcore/tests.py | 109 ++++++++++++++++++++-------------- 2 files changed, 77 insertions(+), 43 deletions(-) diff --git a/wagtail/wagtailadmin/tests.py b/wagtail/wagtailadmin/tests.py index c657c1efb..3e4103137 100644 --- a/wagtail/wagtailadmin/tests.py +++ b/wagtail/wagtailadmin/tests.py @@ -1,7 +1,9 @@ from datetime import timedelta + from django.core.urlresolvers import reverse from django.utils import timezone from django.test import TestCase + from wagtail.tests.models import SimplePage, EventPage from wagtail.tests.utils import login, unittest from wagtail.wagtailcore.models import Page, PageRevision @@ -266,8 +268,10 @@ class TestPageEdit(TestCase): # The page will still be live self.assertTrue(child_page_new.live) + # A revision with approved_go_live_at should not exist self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) + # But a revision with go_live_at and expire_at in their content json *should* exist self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_at.date())).exists()) self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expire_at.date())).exists()) @@ -309,8 +313,10 @@ class TestPageEdit(TestCase): self.assertEqual(response.status_code, 302) child_page_new = SimplePage.objects.get(id=self.child_page.id) + # The page should not be live anymore self.assertFalse(child_page_new.live) + # Instead a revision with approved_go_live_at should now exist self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) @@ -332,8 +338,10 @@ class TestPageEdit(TestCase): self.assertEqual(response.status_code, 302) child_page_new = SimplePage.objects.get(id=self.child_page.id) + # The page should not be live anymore self.assertFalse(child_page_new.live) + # Instead a revision with approved_go_live_at should now exist self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) @@ -352,11 +360,14 @@ class TestPageEdit(TestCase): self.assertEqual(response.status_code, 302) child_page_new = SimplePage.objects.get(id=self.child_page.id) + # The page should be live now self.assertTrue(child_page_new.live) + # And a revision with approved_go_live_at should not exist self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) + class TestPageDelete(TestCase): def setUp(self): # Find root page diff --git a/wagtail/wagtailcore/tests.py b/wagtail/wagtailcore/tests.py index 3eede0e4a..32ec3a826 100644 --- a/wagtail/wagtailcore/tests.py +++ b/wagtail/wagtailcore/tests.py @@ -787,97 +787,120 @@ class TestPublishScheduledPagesCommand(TestCase): self.root_page = Page.objects.get(id=2) def test_go_live_page_will_be_published(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = False - page.go_live_at = timezone.now() - timedelta(days=1) + page = SimplePage( + title="Hello world!", + slug="hello-world", + live=False, + go_live_at=timezone.now() - timedelta(days=1), + ) self.root_page.add_child(instance=page) - page.save_revision( - approved_go_live_at = timezone.now() - timedelta(days=1) - ) + page.save_revision(approved_go_live_at=timezone.now() - timedelta(days=1)) + p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - management.call_command('publish_scheduled_pages', verbosity=3, interactive=False) - #management.call_command('publish_scheduled_pages', dryrun=True, verbosity=3, interactive=False) + + management.call_command('publish_scheduled_pages') + p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) def test_go_live_page_will_be_published(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = False - page.go_live_at = timezone.now() - timedelta(days=1) + page = SimplePage( + title="Hello world!", + slug="hello-world", + live=False, + go_live_at=timezone.now() - timedelta(days=1), + ) self.root_page.add_child(instance=page) - page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1)) + page.save_revision(approved_go_live_at=timezone.now() - timedelta(days=1)) + p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - management.call_command('publish_scheduled_pages', ) + + management.call_command('publish_scheduled_pages') + p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) def test_future_go_live_page_will_not_be_published(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = False - page.go_live_at = timezone.now() + timedelta(days=1) + page = SimplePage( + title="Hello world!", + slug="hello-world", + live=False, + go_live_at=timezone.now() + timedelta(days=1), + ) self.root_page.add_child(instance=page) - page.save_revision(approved_go_live_at = timezone.now() - timedelta(days=1)) + + page.save_revision(approved_go_live_at=timezone.now() - timedelta(days=1)) + p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - management.call_command('publish_scheduled_pages', ) + + management.call_command('publish_scheduled_pages') + p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) def test_expired_page_will_be_unpublished(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = True - page.expire_at = timezone.now() - timedelta(days=1) + page = SimplePage( + title="Hello world!", + slug="hello-world", + live=True, + expire_at=timezone.now() - timedelta(days=1), + ) self.root_page.add_child(instance=page) + p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) - management.call_command('publish_scheduled_pages', ) + + management.call_command('publish_scheduled_pages') + p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) self.assertTrue(p.expired) def test_future_expired_page_will_not_be_unpublished(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = True - page.expire_at = timezone.now() + timedelta(days=1) + page = SimplePage( + title="Hello world!", + slug="hello-world", + live=True, + expire_at=timezone.now() + timedelta(days=1), + ) self.root_page.add_child(instance=page) + p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) - management.call_command('publish_scheduled_pages', ) + + management.call_command('publish_scheduled_pages') + p = Page.objects.get(slug='hello-world') self.assertTrue(p.live) self.assertFalse(p.expired) def test_expired_pages_are_dropped_from_mod_queue(self): - page = SimplePage() - page.title = "Hello world!" - page.slug = "hello-world" - page.live = False - page.expire_at = timezone.now() - timedelta(days=1) + page = SimplePage( + title="Hello world!", + slug="hello-world", + live=False, + expire_at=timezone.now() - timedelta(days=1), + ) self.root_page.add_child(instance=page) - page.save_revision(submitted_for_moderation = True) + + page.save_revision(submitted_for_moderation=True) + p = Page.objects.get(slug='hello-world') self.assertFalse(p.live) self.assertTrue(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists()) - management.call_command('publish_scheduled_pages', ) + + management.call_command('publish_scheduled_pages') + p = Page.objects.get(slug='hello-world') self.assertFalse(PageRevision.objects.filter(page=p, submitted_for_moderation=True).exists()) From c7e6c429543c883bec025cf41f0f477a0ce5a67e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 3 Jun 2014 12:56:15 +0100 Subject: [PATCH 015/298] A couple of minor coding style fixes --- wagtail/wagtailadmin/views/pages.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index f4ea960ff..55040366c 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -157,7 +157,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ page.save_revision( user=request.user, submitted_for_moderation=is_submitting, - approved_go_live_at = approved_go_live_at + approved_go_live_at=approved_go_live_at ) if is_publishing: @@ -255,7 +255,7 @@ def edit(request, page_id): page.save_revision( user=request.user, submitted_for_moderation=is_submitting, - approved_go_live_at = approved_go_live_at + approved_go_live_at=approved_go_live_at ) if is_publishing: From f4245815ba546153e9551afa6db9a9397a042348 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 17 Jun 2014 09:37:35 +0100 Subject: [PATCH 016/298] Added sitemap generator --- wagtail/contrib/wagtailsitemaps/__init__.py | 0 wagtail/contrib/wagtailsitemaps/models.py | 0 .../wagtailsitemaps/sitemap_generator.py | 25 +++++++++++++++++++ .../templates/wagtailsitemaps/sitemap.xml | 13 ++++++++++ wagtail/contrib/wagtailsitemaps/views.py | 23 +++++++++++++++++ 5 files changed, 61 insertions(+) create mode 100644 wagtail/contrib/wagtailsitemaps/__init__.py create mode 100644 wagtail/contrib/wagtailsitemaps/models.py create mode 100644 wagtail/contrib/wagtailsitemaps/sitemap_generator.py create mode 100644 wagtail/contrib/wagtailsitemaps/templates/wagtailsitemaps/sitemap.xml create mode 100644 wagtail/contrib/wagtailsitemaps/views.py diff --git a/wagtail/contrib/wagtailsitemaps/__init__.py b/wagtail/contrib/wagtailsitemaps/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/contrib/wagtailsitemaps/models.py b/wagtail/contrib/wagtailsitemaps/models.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/contrib/wagtailsitemaps/sitemap_generator.py b/wagtail/contrib/wagtailsitemaps/sitemap_generator.py new file mode 100644 index 000000000..53b5dd664 --- /dev/null +++ b/wagtail/contrib/wagtailsitemaps/sitemap_generator.py @@ -0,0 +1,25 @@ +from django.template.loader import render_to_string + + +class Sitemap(object): + template = 'wagtailsitemaps/sitemap.xml' + + def __init__(self, site): + self.site = site + + def get_pages(self): + return self.site.root_page.get_descendants(inclusive=True).live().order_by('path') + + def get_urls(self): + for page in self.get_pages(): + latest_revision = page.get_latest_revision() + + yield { + 'location': page.url, + 'lastmod': latest_revision.created_at if latest_revision else None + } + + def render(self): + return render_to_string(self.template, { + 'urlset': self.get_urls() + }) diff --git a/wagtail/contrib/wagtailsitemaps/templates/wagtailsitemaps/sitemap.xml b/wagtail/contrib/wagtailsitemaps/templates/wagtailsitemaps/sitemap.xml new file mode 100644 index 000000000..30ca3c024 --- /dev/null +++ b/wagtail/contrib/wagtailsitemaps/templates/wagtailsitemaps/sitemap.xml @@ -0,0 +1,13 @@ + + +{% spaceless %} +{% for url in urlset %} + + {{ url.location }} + {% if url.lastmod %}{{ url.lastmod|date:"Y-m-d" }}{% endif %} + {% if url.changefreq %}{{ url.changefreq }}{% endif %} + {% if url.priority %}{{ url.priority }}{% endif %} + +{% endfor %} +{% endspaceless %} + diff --git a/wagtail/contrib/wagtailsitemaps/views.py b/wagtail/contrib/wagtailsitemaps/views.py new file mode 100644 index 000000000..aa5fc2e71 --- /dev/null +++ b/wagtail/contrib/wagtailsitemaps/views.py @@ -0,0 +1,23 @@ +from django.shortcuts import render +from django.http import HttpResponse +from django.core.cache import cache + +from .sitemap_generator import Sitemap + + +def sitemap(request): + cache_key = 'wagtail-sitemap:' + str(request.site.id) + sitemap_xml = cache.get(cache_key) + + if not sitemap_xml: + # Rerender sitemap + sitemap = Sitemap(request.site) + sitemap_xml = sitemap.render() + + cache.set(cache_key, sitemap_xml, 6000) + + # Build response + response = HttpResponse(sitemap_xml) + response['Content-Type'] = "text/xml; charset=utf-8" + + return response From 4788144c86b1dbdc5e230add8407652acefd0316 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 17 Jun 2014 15:09:10 +0100 Subject: [PATCH 017/298] first bash at customisable tabs like in PR #210 --- wagtail/wagtailadmin/edit_handlers.py | 3 +- .../edit_handlers/tabbed_interface.html | 4 +- wagtail/wagtailadmin/views/pages.py | 40 +++++++++++++++++-- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 245f7ad60..ecf692025 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -447,10 +447,11 @@ class BaseObjectList(BaseCompositeEditHandler): template = "wagtailadmin/edit_handlers/object_list.html" -def ObjectList(children, heading=""): +def ObjectList(children, heading="", classes=None): return type('_ObjectList', (BaseObjectList,), { 'children': children, 'heading': heading, + 'classes': classes }) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html index 5bbccb03b..813e40f53 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html @@ -1,12 +1,12 @@
{% for child in self.children %} -
+
{{ child.render_as_object }}
{% endfor %} diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 69e6b7f4f..dedf3bff3 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -155,6 +155,9 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ page.save_revision(user=request.user, submitted_for_moderation=is_submitting) if is_publishing: + message = mark_safe(render_to_string(self.template, { + 'self': self + })) messages.success(request, _("Page '{0}' published.").format(page.title)) elif is_submitting: messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title)) @@ -527,12 +530,41 @@ def set_page_position(request, page_to_move_id): PAGE_EDIT_HANDLERS = {} +def get_default_panels(page_class): + panels = [] + + try: + panels.append(ObjectList(page_class.content_panels, heading='Content')) + except AttributeError: + pass + + try: + panels.append(ObjectList(page_class.promote_panels, heading='Promote')) + except AttributeError: + pass + + try: + panels.append(ObjectList(page_class.settings_panels, heading='Settings', classes='settings')) + except AttributeError: + pass + + return panels + + +def get_panels(page_class): + try: + return page_class.panels + except AttributeError: + return get_default_panels(page_class) + + +def set_panels(page_class, panels): + page_class.panels = panels + + def get_page_edit_handler(page_class): if page_class not in PAGE_EDIT_HANDLERS: - PAGE_EDIT_HANDLERS[page_class] = TabbedInterface([ - ObjectList(page_class.content_panels, heading='Content'), - ObjectList(page_class.promote_panels, heading='Promote') - ]) + PAGE_EDIT_HANDLERS[page_class] = TabbedInterface(get_panels(page_class)) return PAGE_EDIT_HANDLERS[page_class] From 9efb6a38d75269caaeae71809c3c8b6409deadee Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 17 Jun 2014 16:37:22 +0100 Subject: [PATCH 018/298] styling for scenario where tabs run onto multiple lines --- wagtail/wagtailadmin/edit_handlers.py | 2 +- .../wagtailadmin/scss/components/icons.scss | 1 - .../wagtailadmin/scss/components/tabs.scss | 49 ++++++++++++++----- wagtail/wagtailadmin/views/pages.py | 20 ++++---- 4 files changed, 49 insertions(+), 23 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index ecf692025..d3be76161 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -447,7 +447,7 @@ class BaseObjectList(BaseCompositeEditHandler): template = "wagtailadmin/edit_handlers/object_list.html" -def ObjectList(children, heading="", classes=None): +def ObjectList(children, heading="", classes=""): return type('_ObjectList', (BaseObjectList,), { 'children': children, 'heading': heading, diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss index 4de3aa131..9411cb1a8 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss @@ -96,7 +96,6 @@ .icon-unlocked:before { content: "p"; } - .icon-doc-full-inverse:before { content: "r"; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss index b0dec687d..c008ed15e 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss @@ -1,13 +1,15 @@ .tab-nav{ @include clearfix(); padding:0; + background:$color-grey-4; li{ list-style-type:none; - width:48%; + width:50%; float:left; padding:0; position:relative; + margin-bottom:-1px; &:before,&:after{ display:none; @@ -18,13 +20,12 @@ @include box-shadow(inset 0px -2px 3px 0 rgba(0,0,0,0.1)); background-color:$color-grey-4; outline:none; - line-height:3em; text-transform:uppercase; font-weight:700; font-size:1.2em; text-decoration:none; display:block; - padding:0 20px; + padding:0.7em $mobile-nice-padding; color:$color-grey-2; border-top:0.3em solid $color-grey-4; border-bottom:1px solid transparent; @@ -57,6 +58,20 @@ } } + li.settings a{ + padding-left:30px; + padding-right:30px; + + &:before{ + font-family:wagtail; + vertical-align:middle; + text-transform:none; + content:"w"; + margin-right:0.5em; + font-size:1.2em; + } + } + li.active a{ @include box-shadow(none); color:$color-grey-1; @@ -66,7 +81,6 @@ /* For cases where tab-nav should merge with header */ &.merged{ - background-color:$color-header-bg; margin-top:0; } } @@ -82,14 +96,27 @@ } @media screen and (min-width: $breakpoint-mobile){ - .tab-nav li{ - width:auto; - padding:0; - margin-left:0.7em; - } + .tab-nav{ + /* For cases where tab-nav should merge with header */ + &.merged{ + background-color:$color-header-bg; + } - .tab-nav a{ - padding:0 50px; + li{ + width:auto; + padding:0; + margin-left:0.7em; + + &.tab-right{ + float:right; + margin-right:0.7em; + } + } + + a{ + padding-left:$desktop-nice-padding - 10; + padding-right:$desktop-nice-padding - 10; + } } .modal-content .tab-nav li{ diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index dedf3bff3..086c61f0f 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -531,40 +531,40 @@ PAGE_EDIT_HANDLERS = {} def get_default_panels(page_class): - panels = [] + handlers = [] try: - panels.append(ObjectList(page_class.content_panels, heading='Content')) + handlers.append(ObjectList(page_class.content_panels, heading='Content')) except AttributeError: pass try: - panels.append(ObjectList(page_class.promote_panels, heading='Promote')) + handlers.append(ObjectList(page_class.promote_panels, heading='Promote')) except AttributeError: pass try: - panels.append(ObjectList(page_class.settings_panels, heading='Settings', classes='settings')) + handlers.append(ObjectList(page_class.settings_panels, heading='Settings', classes='tab-right settings')) except AttributeError: pass - return panels + return handlers -def get_panels(page_class): +def get_which_page_edit_handler(page_class): try: - return page_class.panels + return page_class.handlers except AttributeError: return get_default_panels(page_class) -def set_panels(page_class, panels): - page_class.panels = panels +def set_page_edit_handler(page_class, handlers): + page_class.handlers = handlers def get_page_edit_handler(page_class): if page_class not in PAGE_EDIT_HANDLERS: - PAGE_EDIT_HANDLERS[page_class] = TabbedInterface(get_panels(page_class)) + PAGE_EDIT_HANDLERS[page_class] = TabbedInterface(get_which_page_edit_handler(page_class)) return PAGE_EDIT_HANDLERS[page_class] From b95d6a0fab18a17a59dc981f7c6213e083c07d6d Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 17 Jun 2014 16:58:12 +0100 Subject: [PATCH 019/298] removed partial work from other branch --- wagtail/wagtailadmin/views/pages.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 086c61f0f..15aa81808 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -155,9 +155,6 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ page.save_revision(user=request.user, submitted_for_moderation=is_submitting) if is_publishing: - message = mark_safe(render_to_string(self.template, { - 'self': self - })) messages.success(request, _("Page '{0}' published.").format(page.title)) elif is_submitting: messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title)) From fb9a876e92c0cbd53a3e30367efcbc05e35b0cdc Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 17 Jun 2014 17:20:22 +0100 Subject: [PATCH 020/298] moved set_page_edit_hanlder to edit_handlders.py. Still not happy it's invoked the right way though --- wagtail/wagtailadmin/edit_handlers.py | 4 ++++ wagtail/wagtailadmin/views/pages.py | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index d3be76161..b7090ff22 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -261,6 +261,10 @@ def extract_panel_definitions_from_model_class(model, exclude=None): return panels +def set_page_edit_handler(page_class, handlers): + page_class.handlers = handlers + + class EditHandler(object): """ Abstract class providing sensible default behaviours for objects implementing diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 15aa81808..67d0e7525 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -555,10 +555,6 @@ def get_which_page_edit_handler(page_class): return get_default_panels(page_class) -def set_page_edit_handler(page_class, handlers): - page_class.handlers = handlers - - def get_page_edit_handler(page_class): if page_class not in PAGE_EDIT_HANDLERS: PAGE_EDIT_HANDLERS[page_class] = TabbedInterface(get_which_page_edit_handler(page_class)) From 553e7062b66bbfaea9d7ba3be5a0d4640269a451 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 17 Jun 2014 17:37:28 +0100 Subject: [PATCH 021/298] added FieldRowPanel from @kaedroho 5dc7a220f8799a7c6871b119724f7e07cb54f4fb --- wagtail/wagtailadmin/edit_handlers.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 245f7ad60..fb5f4b848 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -454,6 +454,17 @@ def ObjectList(children, heading=""): }) +class BaseFieldRowPanel(BaseCompositeEditHandler): + template = "wagtailadmin/edit_handlers/field_row_panel.html" + + +def FieldRowPanel(children, classname=None): + return type('_FieldRowPanel', (BaseFieldRowPanel,), { + 'children': children, + 'classname': classname, + }) + + class BaseMultiFieldPanel(BaseCompositeEditHandler): template = "wagtailadmin/edit_handlers/multi_field_panel.html" From 68da7f0c2c44d2b8661e6849cde56e29141ef98f Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 17 Jun 2014 17:39:48 +0100 Subject: [PATCH 022/298] corrected commit ref to kaedroho@5dc7a220f8799a7c6871b119724f7e07cb54f4fb --- .../wagtailadmin/edit_handlers/field_row_panel.html | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html new file mode 100644 index 000000000..e7371f0b9 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html @@ -0,0 +1,7 @@ +
    + {% for child in self.children %} +
  • + {{ child.render_as_field }} +
    • + {% endfor %} +
From 6a33834d2948d69ce75c8ef3413cb9acc093557f Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 19 Jun 2014 13:30:39 +0100 Subject: [PATCH 023/298] ongoing styling of tabs an publishing fields, inc introduction of salmon colour --- .../templates/wagtailstyleguide/base.html | 13 +++++++--- wagtail/wagtailadmin/edit_handlers.py | 17 ++++++++++-- .../wagtailadmin/scss/components/forms.scss | 8 ++++++ .../wagtailadmin/scss/components/tabs.scss | 5 ++-- .../scss/layouts/page-editor.scss | 26 +++++++++++++------ .../wagtailadmin/scss/layouts/styleguide.scss | 6 +++++ .../static/wagtailadmin/scss/variables.scss | 2 ++ 7 files changed, 61 insertions(+), 16 deletions(-) diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html index e7bd88606..e0d478fe1 100644 --- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html +++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html @@ -42,9 +42,10 @@
  • color-teal
  • color-teal-darker
  • color-teal-dark
    • -
  • color-red
    • -
  • color-orange
    • -
  • color-green
    • + +
      +
    • color-salmon
      • +
    • color-salmon-light
    • color-grey-1
      • @@ -54,6 +55,12 @@
    • color-grey-4
    • color-grey-5
    +
      +
    • color-red
      • +
    • color-orange
      • +
    • color-green
      • +
    +
    diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 175c63225..bfdeaf812 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -602,17 +602,30 @@ def InlinePanel(base_model, relation_name, panels=None, label='', help_text=''): }) +# This allows users to include the publishing panel in their own per-model override +# without having to write these fields out by hand, potentially losing 'classname' +# and therefore the associated styling of the publishing panel +def PublishingPanel(): + return MultiFieldPanel([ + FieldPanel('go_live_at'), + FieldPanel('expire_at'), + ], ugettext_lazy('Scheduled publishing'), classname="publishing") + + # Now that we've defined EditHandlers, we can set up wagtailcore.Page to have some. Page.content_panels = [ FieldPanel('title', classname="full title"), ] + Page.promote_panels = [ MultiFieldPanel([ FieldPanel('slug'), FieldPanel('seo_title'), FieldPanel('show_in_menus'), FieldPanel('search_description'), - FieldPanel('go_live_at'), - FieldPanel('expire_at'), ], ugettext_lazy('Common page configuration')), ] + +Page.settings_panels = [ + PublishingPanel() +] diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 5a870fbcf..0327c940a 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -1,3 +1,9 @@ +/* + These are the generic stylings for forms of any type. + If you're styling something specific to the page editing interface, + it probably ought to go in layouts/page-editor.scss +*/ + form { ul, li{ list-style-type:none; @@ -292,6 +298,7 @@ button.icon{ overflow:hidden; > li{ + @include row(); position:relative; background-color:white; padding:1em 10em 1em 1.5em; /* 10em padding leaves room for controls */ @@ -447,6 +454,7 @@ li.focused > .help{ } } + .fields li{ @include row(); padding-top:0.5em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss index af0c496b1..dab30d114 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss @@ -2,7 +2,6 @@ @include row(); padding:0; background:$color-grey-4; - overflow:hidden; li{ list-style-type:none; @@ -22,10 +21,10 @@ text-decoration:none; display:block; padding:0.7em; - padding-bottom:1em; - margin-bottom:-0.3em; color:white; border-top:0.3em solid lighten($color-teal-darker, 3%); + max-height:1.2em; + overflow:hidden; &:hover{ color:white; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index 5e3120c82..c9fe5b54b 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -25,9 +25,6 @@ } } -.objects{ - background:url("#{$static-root}bg-dark-diag.svg"); -} .object{ position:relative; overflow:hidden; @@ -80,7 +77,7 @@ > h2, &.single-field label{ -webkit-font-smoothing: auto; - background:$color-grey-3; + background:$color-salmon-light; text-transform:uppercase; padding:0.9em 0 0.9em 4em; font-size:0.95em; @@ -92,10 +89,10 @@ left:0; right:0; z-index:1; - text-shadow:1px 1px 1px rgba(255,255,255,0.5); - @include box-shadow(0 0 7px 0 rgba(0,0,0,0.4)); + overflow:hidden; &:before{ + text-shadow:none; font-family:wagtail; text-transform:none; content:"q"; @@ -108,10 +105,11 @@ line-height:1.8em; left:0px; width:1.7em; - opacity:0.15; + color:white; padding:0; margin:0; cursor:pointer; + background-color:$color-salmon; } } @@ -186,6 +184,17 @@ } } + /* special panel for the publishing fields, requires a bit more pizzazz */ + &.publishing{ + h2:before{ + content:"7"; + font-size:2.5em; + line-height:1.4em; + width:1.3em; + } + + } + &.title input, &.title textarea{ font-size:2em; @@ -235,16 +244,17 @@ top:0px; left:0px; width:3.3em; - background-color:$color-teal; padding:0; margin:0 0 0 -20px; cursor:pointer; a{ + @include border-radius(0); font-size: 0em; line-height: 0; overflow: visible; display:block; + background-color:$color-salmon; &:before{ position:relative; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss index 38d4281da..09cb627ed 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss @@ -68,6 +68,12 @@ section{ .color-grey-5{ background-color:$color-grey-5; } + .color-salmon{ + background-color:$color-salmon; + } + .color-salmon-light{ + background-color:$color-salmon-light; + } } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss index 0f6567989..9479b8a28 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss @@ -30,6 +30,8 @@ $color-teal-dark: #246060; $color-red: #f7474e; $color-orange:#e9b04d; $color-green: #189370; +$color-salmon: #f37e77; +$color-salmon-light: #fcf2f2; /* darker to lighter */ $color-grey-1: #333333; From d1b321f859e3a9f19e636c9ec4a0af9ac4992b27 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 19 Jun 2014 13:33:48 +0100 Subject: [PATCH 024/298] made red more distinct from salmon --- wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss index 9479b8a28..e27817175 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/variables.scss @@ -27,7 +27,7 @@ $breakpoint-desktop-larger: 100em; /* 1600px */ $color-teal: #43b1b0; $color-teal-darker: darken($color-teal, 10%); $color-teal-dark: #246060; -$color-red: #f7474e; +$color-red: #cd3238; $color-orange:#e9b04d; $color-green: #189370; $color-salmon: #f37e77; From 62fc679720aeb18c79e9d17fa5e4c6b67b105340 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 19 Jun 2014 13:47:09 +0100 Subject: [PATCH 025/298] further tweaks to colours and form layout --- .../static/wagtailadmin/scss/components/datetimepicker.scss | 2 +- .../static/wagtailadmin/scss/components/forms.scss | 2 +- .../static/wagtailadmin/scss/layouts/page-editor.scss | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss index 078c93469..4902c2418 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/datetimepicker.scss @@ -246,7 +246,7 @@ .xdsoft_calendar td.xdsoft_default, .xdsoft_calendar td.xdsoft_current, .xdsoft_timepicker .xdsoft_time_box > div > div.xdsoft_current{ - background: $color-orange; + background: $color-salmon; color:#fff; font-weight: 700; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 0327c940a..1d9b8b7a7 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -456,7 +456,7 @@ li.focused > .help{ .fields li{ - @include row(); + @include clearfix(); padding-top:0.5em; padding-bottom:1.2em; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index c9fe5b54b..c75f0b6bc 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -79,7 +79,7 @@ -webkit-font-smoothing: auto; background:$color-salmon-light; text-transform:uppercase; - padding:0.9em 0 0.9em 4em; + padding:0.9em 0 0.9em 4.1em; font-size:0.95em; margin:0 0 0.2em 0; line-height:1.5em; @@ -188,9 +188,9 @@ &.publishing{ h2:before{ content:"7"; - font-size:2.5em; + font-size:2.4em; line-height:1.4em; - width:1.3em; + width:1.4em; } } From d778c3693d152d9c4965b3a02597c6494b077e81 Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Thu, 19 Jun 2014 12:17:07 +0100 Subject: [PATCH 026/298] respect DOM re-ordering of formsets even if the parent form errored --- wagtail/wagtailadmin/edit_handlers.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index a15440016..d7a5726c3 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -562,6 +562,11 @@ class BaseInlinePanel(EditHandler): child_edit_handler_class(instance=subform.instance, form=subform) ) + # if this formset is valid, it may have been re-ordered; respect that + # in case the parent form errored and we need to re-render + if self.formset.can_order and self.formset.is_valid(): + self.children = sorted(self.children, key=lambda x: x.form.cleaned_data['ORDER']) + empty_form = self.formset.empty_form empty_form.fields['DELETE'].widget = forms.HiddenInput() if self.formset.can_order: From 269dfe62f5517013d54810832a846ac143339b60 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 19 Jun 2014 16:58:48 +0100 Subject: [PATCH 027/298] refactoring how/where fields get their classes added --- .../templates/wagtailstyleguide/base.html | 1 + wagtail/contrib/wagtailstyleguide/views.py | 1 + wagtail/wagtailadmin/edit_handlers.py | 26 +-- .../wagtailadmin/scss/components/forms.scss | 99 +++++++---- .../wagtailadmin/scss/components/header.scss | 7 - .../wagtailadmin/scss/components/icons.scss | 10 +- .../scss/fonts/wagtail-icomoon.json | 164 ++++++++++-------- .../wagtailadmin/scss/fonts/wagtail.eot | Bin 25504 -> 25648 bytes .../wagtailadmin/scss/fonts/wagtail.svg | 1 + .../wagtailadmin/scss/fonts/wagtail.ttf | Bin 25340 -> 25484 bytes .../wagtailadmin/scss/fonts/wagtail.woff | Bin 15108 -> 15192 bytes .../wagtailadmin/scss/layouts/login.scss | 18 +- .../edit_handlers/chooser_panel.html | 2 +- .../edit_handlers/field_panel_field.html | 24 +-- .../edit_handlers/multi_field_panel.html | 4 +- ...el_object.html => single_field_panel.html} | 2 +- .../templates/wagtailadmin/shared/field.html | 25 +++ .../wagtailadmin/shared/field_as_li.html | 25 +-- .../templates/wagtailadmin/shared/header.html | 2 +- .../wagtailforms/index_submissions.html | 2 +- 20 files changed, 223 insertions(+), 190 deletions(-) rename wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/{field_panel_object.html => single_field_panel.html} (57%) create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html index e0d478fe1..767f69f7f 100644 --- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html +++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html @@ -388,6 +388,7 @@
  • warning
  • success
  • date
    • +
  • time
  • form
    • diff --git a/wagtail/contrib/wagtailstyleguide/views.py b/wagtail/contrib/wagtailstyleguide/views.py index 52c5433a1..9c830073c 100644 --- a/wagtail/contrib/wagtailstyleguide/views.py +++ b/wagtail/contrib/wagtailstyleguide/views.py @@ -23,6 +23,7 @@ class ExampleForm(forms.Form): url = forms.URLField(required=True) email = forms.EmailField(max_length=254) date = forms.DateField() + time = forms.TimeField() select = forms.ChoiceField(choices=CHOICES) boolean = forms.BooleanField(required=False) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index bfdeaf812..9ded8bb29 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -195,9 +195,20 @@ class EditHandler(object): return "" def field_classnames(self): + classname = self.field_type() + "test" + + if self.bound_field.field.required: + classname += " required" + if self.bound_field.errors: + classname += " error" + + return classname + + + def input_classnames(self): """ - Additional classnames to add to the
  • when rendering this within a -
      + Additional classnames to add to the .input surrounding the input field. + Mainly used to identify certain field types boolean_field, url_field, date_field etc """ return "" @@ -367,16 +378,7 @@ class BaseFieldPanel(EditHandler): def field_type(self): return camelcase_to_underscore(self.bound_field.field.__class__.__name__) - def field_classnames(self): - classname = self.field_type() - if self.bound_field.field.required: - classname += " required" - if self.bound_field.errors: - classname += " error" - - return classname - - object_template = "wagtailadmin/edit_handlers/field_panel_object.html" + object_template = "wagtailadmin/edit_handlers/single_field_panel.html" def render_as_object(self): return mark_safe(render_to_string(self.object_template, { diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 1d9b8b7a7..cfa028877 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -419,43 +419,85 @@ li.focused > .help{ .boolean_field .help, .radio .help{ opacity:1; } -.iconfield { - position:relative; + +/* + This is expected to go on the parent of the input/select/textarea + so in most cases .input +*/ +.iconfield, /* generic */ +.date_field, +.time_field, +.date_time_field, +.url_field{ + .input{ + position:relative; + + &:before, &:after{ + font-family:wagtail; + position:absolute; + top:0.5em; + line-height:100%; + font-size:2em; + color:$color-grey-3; + } + &:before{ + left:0.3em; + } + &:after{ + right:0.5em; + } + } input:not([type=radio]), input:not([type=checkbox]), input:not([type=submit]), input:not([type=button]){ padding-left:2.5em; } - &:before, &:after{ - font-family:wagtail; - position:absolute; - top:0.4em; - font-size:1.4em; - color:$color-grey-3; - } - &:before{ - left:0.5em; - } - &:after{ - right:0.5em; + /* smaller fields required slight repositioning of icons */ + &.field-small{ + .input{ + &:before, &:after{ + font-size:1.5em; + top:0.3em; + } + &:before{ + left:0.5em; + } + &:after{ + right:0.5em; + } + } } /* special case for search spinners */ &.icon-spinner:after{ color:$color-teal; opacity:0.8; - font-size:20px; - width:20px; - height:20px; - line-height:23px; text-align:center; top:0.3em; + } +} +.date_field, +.date_time_field{ + .input:before{ + @extend .icon-date:before; + } +} + +.time_field{ + .input:before{ + @extend .icon-time:before; + } +} + +.url_field{ + .input:before{ + @extend .icon-link:before; } } -.fields li{ +.fields > li{ @include clearfix(); padding-top:0.5em; padding-bottom:1.2em; @@ -679,18 +721,17 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ @include column(2); padding-top:1.2em; padding-left:0; + } - .model_multiple_choice_field &, - .boolean_field &, - .model_choice_field &, - .image_field &, - .file_field &{ + /* these fields are formatted differently and label alignment must change */ + .model_multiple_choice_field, + .boolean_field, + .model_choice_field, + .image_field, + .file_field{ + label{ padding-top:0; } - - .boolean_field &{ - padding-bottom:0; - } } input[type=submit], input[type=reset], input[type=button], .button, button{ @@ -721,5 +762,5 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ .field-content{ @include column(10); padding-right:0; - } + } } \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss index d93eaa270..3f079897f 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss @@ -97,13 +97,6 @@ header{ } } -/* mozilla specific hack */ -@-moz-document url-prefix() { - .iconfield.icon-spinner:after{ - line-height:20px; - } -} - .page-explorer header{ margin-bottom:0; padding-bottom:0em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss index 30a089a18..e316e5e97 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss @@ -209,9 +209,9 @@ } .icon-spinner:after{ width:1em; - animation: spin 1s infinite; - -webkit-animation: spin 1s infinite; - -moz-animation: spin 1s infinite; + animation: spin 0.5s infinite linear; + -webkit-animation: spin 0.5s infinite linear; + -moz-animation: spin 0.5s infinite linear; content:"1"; } .icon-pick:before{ @@ -233,6 +233,9 @@ .icon-date:before{ content:"7"; } +.icon-time:before{ + content:"8"; +} .icon-success:before{ content:"9"; } @@ -245,6 +248,7 @@ .icon-form:before{ content:"$"; } + .icon.text-replace{ font-size:0em; line-height:0; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json index 583faf89a..57c8a26f1 100755 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail-icomoon.json @@ -1,6 +1,29 @@ { "IcoMoonType": "selection", "icons": [ + { + "icon": { + "paths": [ + "M632.913 707.493l-173.647-173.649v-232.782h105.469v189.094l142.759 142.757zM512 90.125c-232.995 0-421.875 188.88-421.875 421.875s188.88 421.875 421.875 421.875 421.875-188.88 421.875-421.875-188.88-421.875-421.875-421.875zM512 828.406c-174.747 0-316.406-141.659-316.406-316.406s141.659-316.406 316.406-316.406c174.747 0 316.406 141.659 316.406 316.406s-141.659 316.406-316.406 316.406z" + ], + "tags": [ + "clock", + "time", + "schedule" + ], + "grid": 16 + }, + "properties": { + "id": 72, + "order": 9, + "prevSize": 32, + "code": 56, + "name": "clock", + "ligatures": "" + }, + "setIdx": 0, + "iconIdx": 72 + }, { "icon": { "paths": [ @@ -20,7 +43,7 @@ "name": "lock39copy", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 0 }, { @@ -42,7 +65,7 @@ "name": "lock39-open", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 1 }, { @@ -63,7 +86,7 @@ "name": "form", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 2 }, { @@ -82,7 +105,7 @@ "name": "uni61", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 3 }, { @@ -101,7 +124,7 @@ "name": "uni62", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 4 }, { @@ -120,7 +143,7 @@ "name": "uni63", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 5 }, { @@ -139,7 +162,7 @@ "name": "uni64", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 6 }, { @@ -158,7 +181,7 @@ "name": "uni65", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 7 }, { @@ -177,7 +200,7 @@ "name": "uni66", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 8 }, { @@ -196,7 +219,7 @@ "name": "uni67", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 9 }, { @@ -215,7 +238,7 @@ "name": "uni69", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 10 }, { @@ -234,7 +257,7 @@ "name": "uni6A", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 11 }, { @@ -253,7 +276,7 @@ "name": "uni6B", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 12 }, { @@ -272,7 +295,7 @@ "name": "uni6C", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 13 }, { @@ -291,7 +314,7 @@ "name": "uni6E", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 14 }, { @@ -310,7 +333,7 @@ "name": "uni68", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 15 }, { @@ -329,7 +352,7 @@ "name": "uni6F", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 16 }, { @@ -348,7 +371,7 @@ "name": "uni71", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 17 }, { @@ -367,7 +390,7 @@ "name": "uni72", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 18 }, { @@ -386,7 +409,7 @@ "name": "uni73", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 19 }, { @@ -405,7 +428,7 @@ "name": "uni74", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 20 }, { @@ -424,7 +447,7 @@ "name": "uni75", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 21 }, { @@ -443,7 +466,7 @@ "name": "uni76", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 22 }, { @@ -462,7 +485,7 @@ "name": "uni77", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 23 }, { @@ -481,7 +504,7 @@ "name": "uni78", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 24 }, { @@ -500,7 +523,7 @@ "name": "uni7A", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 25 }, { @@ -519,7 +542,7 @@ "name": "uni41", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 26 }, { @@ -538,7 +561,7 @@ "name": "uni42", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 27 }, { @@ -557,7 +580,7 @@ "name": "uni44", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 28 }, { @@ -576,7 +599,7 @@ "name": "uni43", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 29 }, { @@ -595,7 +618,7 @@ "name": "uni45", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 30 }, { @@ -614,7 +637,7 @@ "name": "uni46", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 31 }, { @@ -633,7 +656,7 @@ "name": "uni47", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 32 }, { @@ -652,7 +675,7 @@ "name": "uni48", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 33 }, { @@ -671,7 +694,7 @@ "name": "uni49", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 34 }, { @@ -690,7 +713,7 @@ "name": "uni4A", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 35 }, { @@ -709,7 +732,7 @@ "name": "uni4B", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 36 }, { @@ -728,7 +751,7 @@ "name": "uni4C", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 37 }, { @@ -747,7 +770,7 @@ "name": "uni4D", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 38 }, { @@ -766,7 +789,7 @@ "name": "uni4E", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 39 }, { @@ -785,7 +808,7 @@ "name": "uni4F", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 40 }, { @@ -804,7 +827,7 @@ "name": "uni50", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 41 }, { @@ -823,7 +846,7 @@ "name": "uni51", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 42 }, { @@ -842,7 +865,7 @@ "name": "uni79", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 43 }, { @@ -861,7 +884,7 @@ "name": "uni52", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 44 }, { @@ -880,7 +903,7 @@ "name": "uni54", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 45 }, { @@ -899,7 +922,7 @@ "name": "uni57", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 46 }, { @@ -918,7 +941,7 @@ "name": "uni58", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 47 }, { @@ -937,7 +960,7 @@ "name": "uni59", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 48 }, { @@ -956,7 +979,7 @@ "name": "uni5A", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 49 }, { @@ -975,7 +998,7 @@ "name": "uni56", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 50 }, { @@ -994,7 +1017,7 @@ "name": "uni31", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 51 }, { @@ -1013,7 +1036,7 @@ "name": "uni55", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 52 }, { @@ -1032,7 +1055,7 @@ "name": "uni33", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 53 }, { @@ -1051,7 +1074,7 @@ "name": "uni32", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 54 }, { @@ -1070,7 +1093,7 @@ "name": "uni35", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 55 }, { @@ -1089,7 +1112,7 @@ "name": "uni36", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 56 }, { @@ -1108,7 +1131,7 @@ "name": "uni30", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 57 }, { @@ -1127,7 +1150,7 @@ "name": "uni3F", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 58 }, { @@ -1146,7 +1169,7 @@ "name": "uni21", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 59 }, { @@ -1165,7 +1188,7 @@ "name": "uni39", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 60 }, { @@ -1184,7 +1207,7 @@ "name": "uni53", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 61 }, { @@ -1203,7 +1226,7 @@ "name": "uni34", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 62 }, { @@ -1222,7 +1245,7 @@ "name": "uni37", "ligatures": "" }, - "setIdx": 0, + "setIdx": 1, "iconIdx": 63 } ], @@ -1245,13 +1268,14 @@ "baseline": 6.25, "whitespace": 50 }, - "showMetadata": false, - "showMetrics": true, - "useClassSelector": false, - "classSelector": ".icon", - "embed": false + "resetPoint": 58880 + }, + "imagePref": { + "color": 0, + "height": 32, + "columns": 16, + "margin": 16 }, - "imagePref": {}, "historySize": 100, "showCodes": true, "search": "", diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot index 605751ad41fb7c6fa3c62568d7881f273d6a9900..343d7c831ef39f15f44a94e09b379e52092ed427 100755 GIT binary patch delta 589 zcmXw$Ur5tY6vxlGKb<;tn`^D@=dj=Jx4GH=Ib7{uvdR!6ri=<45w@Sx9AnFYd$0mW zG(tj3+fz?TM2JKT=ev)ZM1MyQ^;ALh5YbEIL;CAX@Vrs_uPAzH?gvXD&GXa zLTX7BXo#<_C6-Q?itrgX0nh>f*(rG@PpTuHCvBd}-ne$RbK^1bBEVQFJt<@OJN zq=E8*G#T7i<|B>~+tRth>>Y!ymzesXAv>LtcmEz%1IQ)HFXZIeJjB^+fN?qlgzIw7 zJn7S{yd;B~U^qWLQvi-qkjj>?;H|R>3iUJ)2MiEIut6A3!DYCq>?%rq9|+|6$U6h_ zzK6;;<%{xBd8fQpwy6%wB0E$)!Sd=N2Oen04_Jjp;DM&>b_D%Lk&`s6sf+XXMVTYu zWmZn|vYQh=#Lb|0w!#NcO}c0-_L!d0ZnQ2~i4-xCos*BJYd{QpjyWG`U04 z+-PBJ2(@B(*zFz;iwA1hdti3e(PchRfa=q>#fz48_Oo_X+y4hz+5V;8Y%M>k2X!sS zlR+FT&nHioHZp8M!4DjUoa} zK>ib;9)XY6Tj3aur;vru|MEc;LPH3;qKs7;N#$XBakAnM=(ur zhY*+WHIYrCuf(*(y2N)$#7Q2KN|V|m%_Nhdz@!kNa7ochu}jH8>45S&l{qROR3E6t zsQpm)&|uJ5qVYv@n^uz66YVVRf4UQNAL%XA`vG(T(3uP_OlKIlK(1i`I&Sl^q%1}N D9MXga diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg index f095fbd63..11310f293 100755 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg @@ -17,6 +17,7 @@ + diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf index 84159ccc98436dfe8cd5d94f8ebcfa1169528801..ee751e5a601509283d42f5ed3356375793bb1e2b 100755 GIT binary patch delta 575 zcmex!l(FYH;{=6zhTDwC85kI47#J9G(i4jdfV2RR-vOjK(sL@)+NAf-2l6K{FvPWF zq$Z{?Y-oJJz>pvUlsC%&3NSxnG63>@fP9sV+>(lB5dnQ5A7~DvNKSro;@|J0Tnr3} zEkOC6+{B6kh5)8>3=By?I~Wx55_2U}4fs}^1PTBRVYDpBFD_wV21+p`=S1%)rFJ$e_re!eGf@&k)5>_5bhx{~%=y3P3RfpqL{=B3O*^|KtA;|6lum@&ASY zr-1qxCqGOQ-aL`9fUBOFL6?D-@iOCP237_s2B0HV)y<9N8JU&%nAqi*jg9P>)Xnsm zl$n+En9SAen2e3&n8f**l^Jcq8I2j;6Lo#86c`y5tbBB}{VbFi8I>&jw1HeLDMm&q zEh_~j3mpkYMhP7YrMmEvICn;VMN3~D9bZdD7%lRzUs4;y)s}?O3=EriCIriDVR~~V zp5Nvx12+@cPv=i8mP9zK(Sj+bQ-44lT|s&MjPh+?RN> z_=5P&1l9?%32qQ#5(*Jf5cwl!B32@HMS?|Qg%pp}2C0A2J~EpWd=wTb$|$xdUQy~& z=2HHl@=VoAO-pT=x|8}O4KIy%ns!50V!Kw1FEp8%ve(sL@)Ui-a#2;|RTV2J&Y zk(!vou;T1I28Q?!puAZIP=NUnlRl7t0LWL#$StX86cJzo@}B_p2;}4^CvtLqxx>Ja z@C7K}m77>mz~Ikxj)5Vu0mxU#OU#u_HQ-xu5-6|$sKK%zzqo{f87Re&bZ6p@YR?29 zO9bd1W(F1pMg~O&6$Wz#O9p#}D2A&4fB*jnDP&LpiW-1L9T^hAqKy9^|9|-Z+W)Kn zFZ@6M|0Ga1>B4 z<{NXbB^5xi2Mi31A|Tu>VkDrSn^*xf(DDmV5gQo01~B9$=B5J0 z{s0wOg0KPKijxKT#U((uTTFc6DO$oW3ly#t1d& zx*zl&=`S^~Hn?EeXslpdZ{lsT=Fb#92>LyR??={Q(Z06L9L(Zu0T;dtiJCs@{?4(# zyIc3N3#;b$#iGACx^;BAf#h$FS32K0fRf#>UV+H(96GOn!W`XySVc{`T`qM$>V93ut6oJ8Q$zabA#ZdMC@BjZm zIR*v=pqK$r%#k4xEXMf%@&AYaul>LH|HA)MKz-oUFj?1vUnXMHs(^TYo39MqOkkbo hPb`=TVu0w$5f0-`?(gR29}?ovz+lb7z{LOrR(lv2Cp%h;P1ND8Phwy&OWL3}eZ7CMz7Ye1 zc?3{C0fae}*bS0%6AOT1JAnKW5M~TzoRgkd3>34_0rEMZSRf-cF$E}Q0_2;4@rtwa zGJt|Wu^b>@1%#O&G3jUImQ(=6CNMBC3V?8-wOZej({K+6R{MQmW~62Op`n41a| zTLDyL3Bm?^D^3>V7Xuw(^1QKSELJY2x-5A{`_c5AIKE}9= z*@?kraz2wneIk1chbAWrR}|M`?kT+NeBb#W3LF(m651pjD7;BTSoEdXVe$VGz7l7p zq@+&C#K;=R_R7AJpReqvyj{gd<&vtg>Ql86^=TTLH2JjHwI*nLXs^_1*0t81qt~Y& zsQ=uc#!%PjjIp-ycaw-eQ}`h0_Y}S#S%*dY+Pd2|3owhaZLZ|B&|_qnyurNOGXdyg z5e5MUW(F1pMg~P-*qAd|GT1XjF;xBk`~N>smVrS5C~5!}b!12ci!%Oy{Qu$qYyYqQ zzwrP3|C2!7pa>M5Tx-EEv%o2sE1uuxD+4zZSoirO$3T(A0HP8kzbxYz0jJfITmS$7 diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss index 13845ce53..e4bd18be2 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/login.scss @@ -44,6 +44,7 @@ form{ } } label{ + width:auto; color:white; } input[type=submit]{ @@ -85,22 +86,7 @@ form{ } .iconfield:before{ display:none; - } - - .full label{ - @include border-radius(2px); - text-transform:uppercase; - padding:2px 5px; - position:absolute; - top:0; - left:0; - margin-top:-1px; - font-size:0.7em; - z-index:1; - margin:0.2em 0; - line-height:1.5em; - font-weight:normal; - } + } /* Special full-width, one-off fields i.e a single text or textarea input */ .full input{ diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html index a2058cab9..d6fc35c10 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/chooser_panel.html @@ -1,4 +1,4 @@ -{% extends "wagtailadmin/edit_handlers/field_panel_field.html" %} +{% extends "wagtailadmin/shared/field.html" %} {% load i18n %} {% comment %} Either the chosen or unchosen div will be shown, depending on the presence diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html index 472cae0b2..f6f2fb4f5 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_field.html @@ -1,23 +1 @@ -
      - {{ field.label_tag }} -
      -
      - {% block form_field %} - {{ field }} - {% endblock %} - -
      - {% if field.help_text %} -

      {{ field.help_text }}

      - {% endif %} - - {% if field.errors %} -

      - {% for error in field.errors %} - {{ error }} - {% endfor %} -

      - {% endif %} -
      -
      - +{% include "wagtailadmin/shared/field.html" %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html index fc43a70e5..62d75c9b6 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html @@ -2,9 +2,7 @@ {{ self.heading }}
        {% for child in self.children %} -
      • - {{ child.render_as_field }} -
        • +
      • {{ child.render_as_field }}
        • {% endfor %}
      diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html similarity index 57% rename from wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html rename to wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html index 5becef9b4..ecb35cbd6 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_panel_object.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/single_field_panel.html @@ -1,6 +1,6 @@
      {{ self.heading }}
        -
      • {{ field_content }}
        • +
      • {{ field_content }}
      diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html new file mode 100644 index 000000000..9113e1b6b --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field.html @@ -0,0 +1,25 @@ +{% load wagtailadmin_tags %} +
      + {{ field.label_tag }} +
      +
      + {% block form_field %} + {{ field }} + {% endblock %} + + {# This span only used on rare occasions by certain types of input #} + +
      + {% if field.help_text %} +

      {{ field.help_text }}

      + {% endif %} + + {% if field.errors %} +

      + {% for error in field.errors %} + {{ error|escape }} + {% endfor %} +

      + {% endif %} +
      +
      \ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html index a1f51174a..d10e9ba27 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/field_as_li.html @@ -1,25 +1,4 @@ {% load wagtailadmin_tags %} -
    • -
      - {{ field.label_tag }} -
      -
      - {% block form_field %} - {{ field }} - {% endblock %} - -
      - {% if field.help_text %} -

      {{ field.help_text }}

      - {% endif %} - - {% if field.errors %} -

      - {% for error in field.errors %} - {{ error|escape }} - {% endfor %} -

      - {% endif %} -
      -
      +
    • + {% include "wagtailadmin/shared/field.html" %}
      • \ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html index 59340d2d8..be391989d 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html @@ -8,7 +8,7 @@
        {% for field in search_form %} - {% include "wagtailadmin/shared/field_as_li.html" with field=field input_classes="field-small iconfield icon-search" %} + {% include "wagtailadmin/shared/field_as_li.html" with field=field field_classes="field-small iconfield" input_classes="icon-search" %} {% endfor %}
      diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html index ae9572295..8e166111b 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html @@ -39,7 +39,7 @@
        {% for field in select_date_form %} - {% include "wagtailadmin/shared/field_as_li.html" with field=field input_classes="field-small iconfield icon-date" li_classes="col4" %} + {% include "wagtailadmin/shared/field_as_li.html" with field=field field_classes="field-small" li_classes="col4" %} {% endfor %}
      • From 73e7ca00985a0d71aedafa6e5e6c21d5bac890ec Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 19 Jun 2014 17:52:36 +0100 Subject: [PATCH 028/298] removed include of hallo-wagtail-toolbar.js, which only appeared to be broken and was almost identical to the core version --- .../js/hallo-plugins/hallo-wagtail-toolbar.js | 1 + .../static/wagtailadmin/js/page-editor.js | 7 +++++-- .../wagtailadmin/scss/components/forms.scss | 17 ++++++++++------- .../wagtailadmin/scss/panels/rich-text.scss | 3 +-- .../wagtailadmin/pages/_editor_js.html | 1 - 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js index 8e93b8543..f2f282710 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js @@ -33,6 +33,7 @@ } }, _getPosition: function(event, selection) { + alert('here'); var offset, position, width; if (!event) { return; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js index eacb8f86d..3ed3d268c 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js @@ -1,11 +1,14 @@ +"use strict"; + var halloPlugins = { 'halloformat': {}, 'halloheadings': {formatBlocks: ["p", "h2", "h3", "h4", "h5"]}, 'hallolists': {}, 'hallohr': {}, 'halloreundo': {}, - 'hallowagtaillink': {}, + 'hallowagtaillink': {} }; + function registerHalloPlugin(name, opts) { halloPlugins[name] = (opts || {}); } @@ -197,7 +200,7 @@ function InlinePanel(opts) { self.updateMoveButtonDisabledStates = function() { if (opts.canOrder) { - forms = self.formsUl.children('li:visible'); + var forms = self.formsUl.children('li:visible'); forms.each(function(i) { $('ul.controls .inline-child-move-up', this).toggleClass('disabled', i === 0).toggleClass('enabled', i !== 0); $('ul.controls .inline-child-move-down', this).toggleClass('disabled', i === forms.length - 1).toggleClass('enabled', i != forms.length - 1); diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index cfa028877..97b93a065 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -497,19 +497,22 @@ li.focused > .help{ } +/* This is specifically for model that are a generated set of checkboxes/radios */ +.model_multiple_choice_field .input li, +.choice_field .input li{ + label{ + display:block; + width:auto; + float:none; + } +} + .fields > li{ @include clearfix(); padding-top:0.5em; padding-bottom:1.2em; } -.field-content .input li{ - label{ - width:auto; - float:none; - } -} - .input{ clear:both; } diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss index 36db5559a..0e0b72454 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss @@ -3,7 +3,6 @@ .hallotoolbar{ position:absolute; - left:$mobile-nice-padding; z-index:5; margin-top:4em; margin-left:0em; @@ -150,6 +149,6 @@ @media screen and (min-width: $breakpoint-mobile){ .hallotoolbar{ - left:$menu-width + $desktop-nice-padding; + } } \ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index 3ddb8c1f3..5848ca53b 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -16,7 +16,6 @@ - From 91fe81bb9b8ed9648584a78ef5be23bd83a868f2 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Fri, 20 Jun 2014 10:11:10 +0100 Subject: [PATCH 029/298] addressing issue where toolbar was in wrong place. hallo-wagtail-toolbar appeared to override the version provided by hallo, yet removed the one feature from the original version that was essential. --- .../js/hallo-plugins/hallo-wagtail-toolbar.js | 98 ------------------- .../static/wagtailadmin/js/page-editor.js | 2 +- .../static/wagtailadmin/js/vendor/hallo.js | 1 + .../wagtailadmin/scss/panels/rich-text.scss | 10 +- .../wagtailadmin/pages/_editor_js.html | 1 - 5 files changed, 9 insertions(+), 103 deletions(-) delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js deleted file mode 100644 index f2f282710..000000000 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtail-toolbar.js +++ /dev/null @@ -1,98 +0,0 @@ -(function(jQuery) { - return jQuery.widget('IKS.halloToolbarFixed', { - toolbar: null, - options: { - parentElement: 'body', - editable: null, - toolbar: null, - affix: true, - affixTopOffset: 2 - }, - _create: function() { - var el, widthToAdd, - _this = this; - this.toolbar = this.options.toolbar; - this.toolbar.show(); - jQuery(this.options.parentElement).append(this.toolbar); - this._bindEvents(); - jQuery(window).resize(function(event) { - return _this.setPosition(); - }); - jQuery(window).scroll(function(event) { - return _this.setPosition(); - }); - if (this.options.parentElement === 'body') { - el = jQuery(this.element); - widthToAdd = parseFloat(el.css('padding-left')); - widthToAdd += parseFloat(el.css('padding-right')); - widthToAdd += parseFloat(el.css('border-left-width')); - widthToAdd += parseFloat(el.css('border-right-width')); - widthToAdd += (parseFloat(el.css('outline-width'))) * 2; - widthToAdd += (parseFloat(el.css('outline-offset'))) * 2; - return jQuery(this.toolbar).css("width", el.width() + widthToAdd); - } - }, - _getPosition: function(event, selection) { - alert('here'); - var offset, position, width; - if (!event) { - return; - } - width = parseFloat(this.element.css('outline-width')); - offset = width + parseFloat(this.element.css('outline-offset')); - return position = { - top: this.element.offset().top - this.toolbar.outerHeight() - offset, - left: this.element.offset().left - offset - }; - }, - _getCaretPosition: function(range) { - var newRange, position, tmpSpan; - tmpSpan = jQuery(""); - newRange = rangy.createRange(); - newRange.setStart(range.endContainer, range.endOffset); - newRange.insertNode(tmpSpan.get(0)); - position = { - top: tmpSpan.offset().top, - left: tmpSpan.offset().left - }; - tmpSpan.remove(); - return position; - }, - setPosition: function() { - var elementBottom, elementTop, height, offset, scrollTop, topOffset; - if (this.options.parentElement !== 'body') { - return; - } - - this.toolbar.css('top', this.element.offset().top - this.toolbar.outerHeight()); - - if (this.options.affix) { - this.toolbar.removeClass('affixed'); - scrollTop = jQuery(window).scrollTop(); - offset = this.element.offset(); - height = this.element.height(); - topOffset = this.options.affixTopOffset; - elementTop = offset.top - (this.toolbar.height() + this.options.affixTopOffset); - elementBottom = (height - topOffset) + (offset.top - this.toolbar.height()); - if (scrollTop > elementTop && scrollTop < elementBottom) { - this.toolbar.addClass('affixed'); - this.toolbar.css('top', this.options.affixTopOffset); - } - } else { - - } - return this.toolbar; - }, - _updatePosition: function(position) {}, - _bindEvents: function() { - var _this = this; - this.element.on('halloactivated', function(event, data) { - _this.setPosition(); - return _this.toolbar.show(); - }); - return this.element.on('hallodeactivated', function(event, data) { - return _this.toolbar.hide(); - }); - } - }); -})(jQuery); \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js index 3ed3d268c..32c2fa10e 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js @@ -33,7 +33,7 @@ function makeRichTextEditable(id) { richText.hallo({ toolbar: 'halloToolbarFixed', - toolbarcssClass: 'testy', + toolbarCssClass: (input.closest('.object').hasClass('full')) ? 'full' : '', plugins: halloPlugins }).bind('hallomodified', function(event, data) { input.val(data.content); diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js index af5950fdb..9e4655dc4 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js @@ -2829,6 +2829,7 @@ } else { } + return this.toolbar.css('left', this.element.offset().left - 2); }, _updatePosition: function(position) {}, diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss index 0e0b72454..2ff4501c8 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/panels/rich-text.scss @@ -5,7 +5,11 @@ position:absolute; z-index:5; margin-top:4em; - margin-left:0em; + margin-left:1.2em; +} +/* full is added to hallotoolbar when invoked on a field set to the full layout style */ +.hallotoolbar.full{ + margin-left:$mobile-nice-padding; } .hallotoolbar.affixed{ position:fixed; @@ -148,7 +152,7 @@ } @media screen and (min-width: $breakpoint-mobile){ - .hallotoolbar{ - + .hallotoolbar.full{ + margin-left:$desktop-nice-padding; } } \ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index 5848ca53b..17bcbd8bf 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -19,7 +19,6 @@ - From 2c50a49ef6a69b1bef5b251bfded7cf95f5e22ea Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Fri, 20 Jun 2014 10:34:27 +0100 Subject: [PATCH 030/298] further tweaks to prevent scrolling of date inputs --- wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js | 4 ++++ .../static/wagtailadmin/scss/layouts/page-editor.scss | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js index 32c2fa10e..fe60f1dd4 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js @@ -60,6 +60,7 @@ function initDateChooser(id) { if (window.dateTimePickerTranslations) { $('#' + id).datetimepicker({ timepicker: false, + scrollInput:false, format: 'Y-m-d', i18n: { lang: window.dateTimePickerTranslations @@ -69,6 +70,7 @@ function initDateChooser(id) { } else { $('#' + id).datetimepicker({ timepicker: false, + scrollInput:false, format: 'Y-m-d', }); } @@ -78,6 +80,7 @@ function initTimeChooser(id) { if (window.dateTimePickerTranslations) { $('#' + id).datetimepicker({ datepicker: false, + scrollInput:false, format: 'H:i', i18n: { lang: window.dateTimePickerTranslations @@ -96,6 +99,7 @@ function initDateTimeChooser(id) { if (window.dateTimePickerTranslations) { $('#' + id).datetimepicker({ format: 'Y-m-d H:i', + scrollInput:false, i18n: { lang: window.dateTimePickerTranslations }, diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index c75f0b6bc..ae9fb5078 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -25,6 +25,12 @@ } } +.page-editor .xdsoft_datetimepicker{ + border-top:0; + margin-top:-1px; + margin-left:3px; +} + .object{ position:relative; overflow:hidden; From f147581ca697242930c2bf760e38d852f3bde897 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Fri, 20 Jun 2014 12:58:18 +0100 Subject: [PATCH 031/298] better css class concat --- wagtail/wagtailadmin/edit_handlers.py | 28 ++++++++-------- .../wagtailadmin/scss/components/forms.scss | 33 +++++++++++++------ .../edit_handlers/field_row_panel.html | 4 +-- .../edit_handlers/multi_field_panel.html | 2 +- .../edit_handlers/object_list.html | 2 +- .../edit_handlers/tabbed_interface.html | 4 +-- 6 files changed, 44 insertions(+), 29 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index c8d2ac0c6..61eb0bd5b 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -193,10 +193,15 @@ class EditHandler(object): Subclasses of EditHandler should override this, invoking super(B, self).classes() to append more classes specific to the situation. """ + + classes = [] + try: - return self.classname + classes.append(self.classname) except AttributeError: - return "" + pass + + return classes def field_type(self): """ @@ -343,12 +348,8 @@ class BaseMultiFieldPanel(BaseCompositeEditHandler): def classes(self): classes = super(BaseMultiFieldPanel, self).classes() - - try: - classes += " multi-field " - except (AttributeError, TypeError): - pass - + classes.append("multi-field") + return classes def MultiFieldPanel(children, heading="", classname=""): @@ -371,12 +372,13 @@ class BaseFieldPanel(EditHandler): classes = super(BaseFieldPanel, self).classes(); if self.bound_field.field.required: - classes += " required " + classes.append("required") if self.bound_field.errors: - classes += " error " + classes.append("error") + + classes.append(self.field_type()) + classes.append("single-field") - classes += self.field_type() + " single-field " - return classes def field_type(self): @@ -616,7 +618,7 @@ def PublishingPanel(): FieldRowPanel([ FieldPanel('go_live_at'), FieldPanel('expire_at'), - ], classname="labels-above"), + ], classname="label-above"), ], ugettext_lazy('Scheduled publishing'), classname="publishing") diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 7b84c6181..1658a0edc 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -507,12 +507,19 @@ li.focused > .help{ } } -.fields > li{ +.fields > li, +.field-col{ @include clearfix(); padding-top:0.5em; padding-bottom:1.2em; } +.field-row{ + @include clearfix(); + /* negative margin the bottom so it doesn't add too much space */ + margin-bottom:-1.2em; +} + .input{ clear:both; } @@ -526,15 +533,6 @@ li.focused > .help{ } } -.field-col{ - float:left; -} - -.labels-above{ - -} - - .field{ &.col1, &.col2, @@ -746,6 +744,15 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ } } + .label-above{ + .field > label{ + display:block; + padding:0 0 0.8em 0; + float:none; + width:auto; + } + } + input[type=submit], input[type=reset], input[type=button], .button, button{ font-size:0.95em; padding:0.75em 1.4em; @@ -771,8 +778,14 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ @include row(); } + .field-col{ + float:left; + padding-left:0 !important; + } + .field-content{ @include column(10); padding-right:0; + padding-left:0; } } \ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html index 4ef5dfff4..ead32db1a 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/field_row_panel.html @@ -1,6 +1,6 @@ -
          +
            {% for child in self.children %} -
          • +
          • {{ child.render_as_field }}
            • {% endfor %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html index 62d75c9b6..2d1be5b46 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/multi_field_panel.html @@ -2,7 +2,7 @@ {{ self.heading }}
              {% for child in self.children %} -
            • {{ child.render_as_field }}
              • +
            • {{ child.render_as_field }}
              • {% endfor %}
            diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html index 5c8357680..81bc39dc7 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/object_list.html @@ -1,6 +1,6 @@
              {% for child in self.children %} -
            • +
            • {% if child.heading %}

              {{ child.heading }}

              {% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html index 813e40f53..b70c1d47a 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/edit_handlers/tabbed_interface.html @@ -1,12 +1,12 @@
              {% for child in self.children %} -
              +
              {{ child.render_as_object }}
              {% endfor %} From 8e1b2cf019f0ad6c6b78ce5e8b16a5a1f123c7d9 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 23 Jun 2014 13:43:21 +0100 Subject: [PATCH 032/298] Sitemap timeout can now be configured with a setting --- wagtail/contrib/wagtailsitemaps/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wagtail/contrib/wagtailsitemaps/views.py b/wagtail/contrib/wagtailsitemaps/views.py index aa5fc2e71..4ef02de0b 100644 --- a/wagtail/contrib/wagtailsitemaps/views.py +++ b/wagtail/contrib/wagtailsitemaps/views.py @@ -1,6 +1,7 @@ from django.shortcuts import render from django.http import HttpResponse from django.core.cache import cache +from django.conf import settings from .sitemap_generator import Sitemap @@ -14,7 +15,7 @@ def sitemap(request): sitemap = Sitemap(request.site) sitemap_xml = sitemap.render() - cache.set(cache_key, sitemap_xml, 6000) + cache.set(cache_key, sitemap_xml, getattr(settings, 'WAGTAILSITEMAPS_CACHE_TIMEOUT', 6000)) # Build response response = HttpResponse(sitemap_xml) From ee7aebc9daf4517f2540e80ebe30c53685af3067 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 23 Jun 2014 13:43:34 +0100 Subject: [PATCH 033/298] Added tests for sitemaps --- runtests.py | 1 + wagtail/contrib/wagtailsitemaps/tests.py | 71 ++++++++++++++++++++++++ wagtail/tests/urls.py | 3 + 3 files changed, 75 insertions(+) create mode 100644 wagtail/contrib/wagtailsitemaps/tests.py diff --git a/runtests.py b/runtests.py index 6fd37ebeb..286a9e6b0 100755 --- a/runtests.py +++ b/runtests.py @@ -84,6 +84,7 @@ if not settings.configured: 'wagtail.wagtailsearch', 'wagtail.wagtailredirects', 'wagtail.wagtailforms', + 'wagtail.contrib.wagtailsitemaps', 'wagtail.tests', ], diff --git a/wagtail/contrib/wagtailsitemaps/tests.py b/wagtail/contrib/wagtailsitemaps/tests.py new file mode 100644 index 000000000..4adf3f98b --- /dev/null +++ b/wagtail/contrib/wagtailsitemaps/tests.py @@ -0,0 +1,71 @@ +from django.test import TestCase +from django.core.urlresolvers import reverse + +from wagtail.wagtailcore.models import Page, Site +from wagtail.tests.models import SimplePage + +from .sitemap_generator import Sitemap + + +class TestSitemapGenerator(TestCase): + def setUp(self): + self.home_page = Page.objects.get(id=2) + + self.child_page = self.home_page.add_child(instance=SimplePage( + title="Hello world!", + slug='hello-world', + live=True, + )) + + self.unpublished_child_page = self.home_page.add_child(instance=SimplePage( + title="Unpublished", + slug='unpublished', + live=False, + )) + + self.site = Site.objects.get(is_default_site=True) + + def test_get_pages(self): + sitemap = Sitemap(self.site) + pages = sitemap.get_pages() + + self.assertIn(self.child_page.page_ptr, pages) + self.assertNotIn(self.unpublished_child_page.page_ptr, pages) + + def test_get_urls(self): + sitemap = Sitemap(self.site) + urls = [url['location'] for url in sitemap.get_urls()] + + self.assertIn('/', urls) # Homepage + self.assertIn('/hello-world/', urls) # Child page + + def test_render(self): + sitemap = Sitemap(self.site) + xml = sitemap.render() + + # Check that a URL has made it into the xml + self.assertIn('/hello-world/', xml) + + +class TestSitemapView(TestCase): + def test_sitemap_view(self): + response = self.client.get('/sitemap.xml') + + self.assertEqual(response.status_code, 200) + self.assertTemplateUsed(response, 'wagtailsitemaps/sitemap.xml') + self.assertEqual(response['Content-Type'], 'text/xml; charset=utf-8') + + def test_sitemap_view_cache(self): + first_response = self.client.get('/sitemap.xml') + + self.assertEqual(first_response.status_code, 200) + self.assertTemplateUsed(first_response, 'wagtailsitemaps/sitemap.xml') + + # Hit the view again. Should come from the cache this time + second_response = self.client.get('/sitemap.xml') + + self.assertEqual(second_response.status_code, 200) + self.assertTemplateNotUsed(second_response, 'wagtailsitemaps/sitemap.xml') # Sitemap should not be re rendered + + # Check that the content is the same + self.assertEqual(first_response.content, second_response.content) diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index d04c871a3..83e12adfb 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -4,6 +4,7 @@ from wagtail.wagtailcore import urls as wagtail_urls from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls +from wagtail.contrib.wagtailsitemaps.views import sitemap # Signal handlers from wagtail.wagtailsearch import register_signal_handlers as wagtailsearch_register_signal_handlers @@ -15,6 +16,8 @@ urlpatterns = patterns('', url(r'^search/', include(wagtailsearch_frontend_urls)), url(r'^documents/', include(wagtaildocs_urls)), + url(r'^sitemap\.xml$', sitemap), + # For anything not caught by a more specific rule above, hand over to # Wagtail's serving mechanism url(r'', include(wagtail_urls)), From d76c8613fb77683dfdffd74e2cafd4eda4a242ad Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 23 Jun 2014 14:08:42 +0100 Subject: [PATCH 034/298] Added get_sitemap_urls method to page and use it in sitemaps --- .../wagtailsitemaps/sitemap_generator.py | 8 ++----- wagtail/wagtailcore/models.py | 21 ++++++++++++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/wagtail/contrib/wagtailsitemaps/sitemap_generator.py b/wagtail/contrib/wagtailsitemaps/sitemap_generator.py index 53b5dd664..eb08d81b7 100644 --- a/wagtail/contrib/wagtailsitemaps/sitemap_generator.py +++ b/wagtail/contrib/wagtailsitemaps/sitemap_generator.py @@ -12,12 +12,8 @@ class Sitemap(object): def get_urls(self): for page in self.get_pages(): - latest_revision = page.get_latest_revision() - - yield { - 'location': page.url, - 'lastmod': latest_revision.created_at if latest_revision else None - } + for url in page.get_sitemap_urls(): + yield url def render(self): return render_to_string(self.template, { diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 1f0c98d83..c1e48750b 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -623,13 +623,32 @@ class Page(MP_Node, ClusterableModel, Indexed): """ return self.serve(self.dummy_request()) + def get_internal_paths(self): + """ + This returns a list of paths within this page. + This is used for static sites, sitemaps and cache invalidation. + """ + return ['/'] + + def get_sitemap_urls(self): + latest_revision = self.get_latest_revision() + + return [ + { + 'location': self.url + url[1:], + 'lastmod': latest_revision.created_at if latest_revision else None + } + for url in self.get_internal_paths() + ] + def get_static_site_paths(self): """ This is a generator of URL paths to feed into a static site generator Override this if you would like to create static versions of subpages """ # Yield paths for this page - yield '/' + for url in self.get_internal_paths(): + yield url # Yield paths for child pages for child in self.get_children().live(): From 183c73c78a4080551cc63c4623dddc3d5dc30ffd Mon Sep 17 00:00:00 2001 From: Tom Talbot Date: Tue, 24 Jun 2014 11:50:44 +0100 Subject: [PATCH 035/298] Fix test_edit_handlers breaking other tests --- wagtail/wagtailadmin/tests/test_edit_handlers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index c930974fe..495a3ed41 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -210,8 +210,10 @@ class TestBaseFieldPanel(TestCase): def setUp(self): fake_field = self.FakeField() - BaseFieldPanel.field_name = 'barbecue' - self.base_field_panel = BaseFieldPanel( + fake_base_field_panel = type('_FieldPanel', + (BaseFieldPanel,), + {'field_name': 'barbecue'}) + self.base_field_panel = fake_base_field_panel( instance=True, form={'barbecue': fake_field}) From 085324c1b6e67a6bfa7b87d76fd3df375721e764 Mon Sep 17 00:00:00 2001 From: Tom Talbot Date: Tue, 24 Jun 2014 14:30:23 +0100 Subject: [PATCH 036/298] Update snippets tests Add an Advert fixture so that Advert objects do not need to be created by the tests that use them. --- wagtail/tests/fixtures/test.json | 8 ++++++++ wagtail/wagtailsnippets/tests.py | 23 +++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json index 11b82d9f1..31b47dfdd 100644 --- a/wagtail/tests/fixtures/test.json +++ b/wagtail/tests/fixtures/test.json @@ -418,5 +418,13 @@ "page": 8, "submit_time": "2014-01-01T12:00:00.000Z" } +}, +{ + "pk": 1, + "model": "tests.advert", + "fields": { + "text": "test_advert", + "url": "http://www.example.com" + } } ] diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 1b1e012de..6e18b3ba4 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -78,12 +78,10 @@ class TestSnippetCreateView(TestCase, WagtailTestUtils): class TestSnippetEditView(TestCase, WagtailTestUtils): - def setUp(self): - self.test_snippet = Advert() - self.test_snippet.text = 'test_advert' - self.test_snippet.url = 'http://www.example.com/' - self.test_snippet.save() + fixtures = ['wagtail/tests/fixtures/test.json'] + def setUp(self): + self.test_snippet = Advert.objects.get(id=1) self.login() def get(self, params={}): @@ -127,12 +125,10 @@ class TestSnippetEditView(TestCase, WagtailTestUtils): class TestSnippetDelete(TestCase, WagtailTestUtils): - def setUp(self): - self.test_snippet = Advert() - self.test_snippet.text = 'test_advert' - self.test_snippet.url = 'http://www.example.com/' - self.test_snippet.save() + fixtures = ['wagtail/tests/fixtures/test.json'] + def setUp(self): + self.test_snippet = Advert.objects.get(id=1) self.login() def test_delete_get(self): @@ -151,14 +147,13 @@ class TestSnippetDelete(TestCase, WagtailTestUtils): class TestSnippetChooserPanel(TestCase): + fixtures = ['wagtail/tests/fixtures/test.json'] + def setUp(self): content_type = get_content_type_from_url_params('tests', 'advert') - test_snippet = Advert() - test_snippet.text = 'test_advert' - test_snippet.url = 'http://www.example.com/' - test_snippet.save() + test_snippet = Advert.objects.get(id=1) edit_handler_class = get_snippet_edit_handler(Advert) form_class = edit_handler_class.get_form_class(Advert) From 40ca017c368944648ac3145e5dbe7be83e806f82 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 25 Jun 2014 17:31:03 +0100 Subject: [PATCH 037/298] Started work on page duplication --- wagtail/tests/fixtures/test.json | 11 +++++ wagtail/wagtailcore/models.py | 21 ++++++++++ wagtail/wagtailcore/tests/test_page_model.py | 44 ++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json index 11b82d9f1..ab5cf10ac 100644 --- a/wagtail/tests/fixtures/test.json +++ b/wagtail/tests/fixtures/test.json @@ -85,6 +85,17 @@ } }, +{ + "pk": 1, + "model": "tests.eventpagespeaker", + "fields": { + "page": 4, + "first_name": "Santa", + "last_name": "Claus", + "sort_order": 0 + } +}, + { "pk": 5, "model": "wagtailcore.page", diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 6b273e4b6..42307382d 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -556,6 +556,27 @@ class Page(MP_Node, ClusterableModel, Indexed): new_self.save() new_self._update_descendant_url_paths(old_url_path, new_url_path) + def duplicate(self, recursive=False, **update_fields): + page_copy = Page.objects.get(id=self.id).specific + page_copy.pk = None + page_copy.id = None + + for field, value in update_fields.items(): + setattr(page_copy, field, value) + + page_copy = self.add_sibling(instance=page_copy) + + # Duplicate child objects + if hasattr(self._meta, 'child_relations'): + for child_relation in self._meta.child_relations: + pass + + # Duplicate child pages + if recursive: + pass + + return page_copy + def permissions_for_user(self, user): """ Return a PagePermissionsTester object defining what actions the user can perform on this page diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 1bae57952..403475ebb 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -224,3 +224,47 @@ class TestMovePage(TestCase): christmas = events_index.get_children().get(slug='christmas') self.assertEqual(christmas.depth, 5) self.assertEqual(christmas.url_path, '/home/about-us/events/christmas/') + + +class TestDuplicatePage(TestCase): + fixtures = ['test.json'] + + def test_duplicate_page_copies(self): + about_us = SimplePage.objects.get(url_path='/home/about-us/') + + # Duplicate it + new_about_us = about_us.duplicate(title="New about us", slug='new-about-us') + + # Check that new_about_us is correct + self.assertIsInstance(new_about_us, SimplePage) + self.assertEqual(new_about_us.title, "New about us") + self.assertEqual(new_about_us.slug, 'new-about-us') + + # Check that new_about_us is a different page + self.assertNotEqual(about_us.id, new_about_us.id) + + def test_duplicate_page_copies_child_objects(self): + christmas_event = EventPage.objects.get(url_path='/home/events/christmas/') + + # Duplicate it + new_christmas_event = christmas_event.duplicate(title="New christmas event", slug='new-christmas-event') + + # Check that the speakers were copied + self.assertEqual(new_christmas_event.speakers.count(), 1, "Child objects weren't copied") + + # Check that the speakers weren't removed from old page + self.assertEqual(christmas_event.speakers.count(), 1, "Child objects were removed from the original page") + + def test_duplicate_page_copies_recursively(self): + events_index = EventIndex.objects.get(url_path='/home/events/') + + # Duplicate it + new_events_index = events_index.duplicate(recursive=True, title="New events index", slug='new-events-index') + + # Get christmas event + old_christmas_event = events_index.get_children().filter(slug='christmas').first() + new_christmas_event = new_events_index.get_children().filter(slug='christmas').first() + + # Check that the event exists in both places + self.assertNotEqual(new_christmas_event, None, "Child pages weren't copied") + self.assertNotEqual(old_christmas_event, None, "Child pages were removed from original page") From 39f9b9b0c21014e864672ecbc18572fe9e35ec69 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 26 Jun 2014 09:34:42 +0100 Subject: [PATCH 038/298] Renamed 'duplicate' to 'copy' --- wagtail/wagtailcore/models.py | 6 +++--- wagtail/wagtailcore/tests/test_page_model.py | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 42307382d..7945fa53a 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -556,7 +556,7 @@ class Page(MP_Node, ClusterableModel, Indexed): new_self.save() new_self._update_descendant_url_paths(old_url_path, new_url_path) - def duplicate(self, recursive=False, **update_fields): + def copy(self, recursive=False, **update_fields): page_copy = Page.objects.get(id=self.id).specific page_copy.pk = None page_copy.id = None @@ -566,12 +566,12 @@ class Page(MP_Node, ClusterableModel, Indexed): page_copy = self.add_sibling(instance=page_copy) - # Duplicate child objects + # Copy child objects if hasattr(self._meta, 'child_relations'): for child_relation in self._meta.child_relations: pass - # Duplicate child pages + # Copy child pages if recursive: pass diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 403475ebb..86df5bf7c 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -226,14 +226,14 @@ class TestMovePage(TestCase): self.assertEqual(christmas.url_path, '/home/about-us/events/christmas/') -class TestDuplicatePage(TestCase): +class TestCopyPage(TestCase): fixtures = ['test.json'] - def test_duplicate_page_copies(self): + def test_copy_page_copies(self): about_us = SimplePage.objects.get(url_path='/home/about-us/') - # Duplicate it - new_about_us = about_us.duplicate(title="New about us", slug='new-about-us') + # Copy it + new_about_us = about_us.copy(title="New about us", slug='new-about-us') # Check that new_about_us is correct self.assertIsInstance(new_about_us, SimplePage) @@ -243,11 +243,11 @@ class TestDuplicatePage(TestCase): # Check that new_about_us is a different page self.assertNotEqual(about_us.id, new_about_us.id) - def test_duplicate_page_copies_child_objects(self): + def test_copy_page_copies_child_objects(self): christmas_event = EventPage.objects.get(url_path='/home/events/christmas/') - # Duplicate it - new_christmas_event = christmas_event.duplicate(title="New christmas event", slug='new-christmas-event') + # Copy it + new_christmas_event = christmas_event.copy(title="New christmas event", slug='new-christmas-event') # Check that the speakers were copied self.assertEqual(new_christmas_event.speakers.count(), 1, "Child objects weren't copied") @@ -255,11 +255,11 @@ class TestDuplicatePage(TestCase): # Check that the speakers weren't removed from old page self.assertEqual(christmas_event.speakers.count(), 1, "Child objects were removed from the original page") - def test_duplicate_page_copies_recursively(self): + def test_copy_page_copies_recursively(self): events_index = EventIndex.objects.get(url_path='/home/events/') - # Duplicate it - new_events_index = events_index.duplicate(recursive=True, title="New events index", slug='new-events-index') + # Copy it + new_events_index = events_index.copy(recursive=True, title="New events index", slug='new-events-index') # Get christmas event old_christmas_event = events_index.get_children().filter(slug='christmas').first() From 069406f86b8e5aabad32567c94f2fafa2a8c643a Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 26 Jun 2014 09:45:51 +0100 Subject: [PATCH 039/298] Implemented recursive copying --- wagtail/wagtailcore/models.py | 13 ++++++++++--- wagtail/wagtailcore/tests/test_page_model.py | 6 ++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 7945fa53a..a0bae2c99 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -556,15 +556,21 @@ class Page(MP_Node, ClusterableModel, Indexed): new_self.save() new_self._update_descendant_url_paths(old_url_path, new_url_path) - def copy(self, recursive=False, **update_fields): + def copy(self, recursive=False, to=None, **update_fields): page_copy = Page.objects.get(id=self.id).specific page_copy.pk = None page_copy.id = None + page_copy.depth = None + page_copy.numchild = 0 + page_copy.path = None for field, value in update_fields.items(): setattr(page_copy, field, value) - page_copy = self.add_sibling(instance=page_copy) + if to: + page_copy = to.add_child(instance=page_copy) + else: + page_copy = self.add_sibling(instance=page_copy) # Copy child objects if hasattr(self._meta, 'child_relations'): @@ -573,7 +579,8 @@ class Page(MP_Node, ClusterableModel, Indexed): # Copy child pages if recursive: - pass + for child_page in self.get_children(): + child_page.copy(recursive=True, to=page_copy) return page_copy diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 86df5bf7c..fd45ca260 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -243,6 +243,9 @@ class TestCopyPage(TestCase): # Check that new_about_us is a different page self.assertNotEqual(about_us.id, new_about_us.id) + # Check that the url path was updated + self.assertEqual(new_about_us.url_path, '/home/new-about-us/') + def test_copy_page_copies_child_objects(self): christmas_event = EventPage.objects.get(url_path='/home/events/christmas/') @@ -268,3 +271,6 @@ class TestCopyPage(TestCase): # Check that the event exists in both places self.assertNotEqual(new_christmas_event, None, "Child pages weren't copied") self.assertNotEqual(old_christmas_event, None, "Child pages were removed from original page") + + # Check that the url path was updated + self.assertEqual(new_christmas_event.url_path, '/home/new-events-index/christmas/') From b9993a8c1ea5a13ae172ef875ab8d0a01360cbed Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 26 Jun 2014 09:51:50 +0100 Subject: [PATCH 040/298] Page copy now copies child objects --- wagtail/wagtailcore/models.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index a0bae2c99..d8b27d271 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -575,7 +575,14 @@ class Page(MP_Node, ClusterableModel, Indexed): # Copy child objects if hasattr(self._meta, 'child_relations'): for child_relation in self._meta.child_relations: - pass + parental_key_name = child_relation.field.attname + child_objects = getattr(self, child_relation.get_accessor_name(), None) + + if child_objects: + for child_object in child_objects.all(): + child_object.pk = None + setattr(child_object, parental_key_name, page_copy.id) + child_object.save() # Copy child pages if recursive: From 74d1555ac1e88412f53bd9ac997d11defde4f254 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 26 Jun 2014 13:55:25 +0100 Subject: [PATCH 041/298] Fixed bug causing child objects of child pages to not be copied --- wagtail/wagtailcore/models.py | 2 +- wagtail/wagtailcore/tests/test_page_model.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index d8b27d271..f0911112d 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -587,7 +587,7 @@ class Page(MP_Node, ClusterableModel, Indexed): # Copy child pages if recursive: for child_page in self.get_children(): - child_page.copy(recursive=True, to=page_copy) + child_page.specific.copy(recursive=True, to=page_copy) return page_copy diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index fd45ca260..3c67c3c69 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -274,3 +274,19 @@ class TestCopyPage(TestCase): # Check that the url path was updated self.assertEqual(new_christmas_event.url_path, '/home/new-events-index/christmas/') + + def test_copy_page_copies_recursively_with_child_objects(self): + events_index = EventIndex.objects.get(url_path='/home/events/') + + # Copy it + new_events_index = events_index.copy(recursive=True, title="New events index", slug='new-events-index') + + # Get christmas event + old_christmas_event = events_index.get_children().filter(slug='christmas').first() + new_christmas_event = new_events_index.get_children().filter(slug='christmas').first() + + # Check that the speakers were copied + self.assertEqual(new_christmas_event.specific.speakers.count(), 1, "Child objects weren't copied") + + # Check that the speakers weren't removed from old page + self.assertEqual(old_christmas_event.specific.speakers.count(), 1, "Child objects were removed from the original page") From 98effcb4d7c80712574d41de66513e9a6cf3b4f1 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 26 Jun 2014 13:56:17 +0100 Subject: [PATCH 042/298] Minor cleanup --- wagtail/wagtailcore/models.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index f0911112d..edf423b50 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -573,16 +573,15 @@ class Page(MP_Node, ClusterableModel, Indexed): page_copy = self.add_sibling(instance=page_copy) # Copy child objects - if hasattr(self._meta, 'child_relations'): - for child_relation in self._meta.child_relations: - parental_key_name = child_relation.field.attname - child_objects = getattr(self, child_relation.get_accessor_name(), None) + for child_relation in getattr(self._meta, 'child_relations', []): + parental_key_name = child_relation.field.attname + child_objects = getattr(self, child_relation.get_accessor_name(), None) - if child_objects: - for child_object in child_objects.all(): - child_object.pk = None - setattr(child_object, parental_key_name, page_copy.id) - child_object.save() + if child_objects: + for child_object in child_objects.all(): + child_object.pk = None + setattr(child_object, parental_key_name, page_copy.id) + child_object.save() # Copy child pages if recursive: From 1367669685cee9c48e60996d24712257a47508d0 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 26 Jun 2014 14:10:55 +0100 Subject: [PATCH 043/298] Make sure we have the most specific version of a page before copying child objects --- wagtail/wagtailcore/models.py | 6 ++++-- wagtail/wagtailcore/tests/test_page_model.py | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index edf423b50..e7cb616da 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -557,6 +557,7 @@ class Page(MP_Node, ClusterableModel, Indexed): new_self._update_descendant_url_paths(old_url_path, new_url_path) def copy(self, recursive=False, to=None, **update_fields): + # Make a copy page_copy = Page.objects.get(id=self.id).specific page_copy.pk = None page_copy.id = None @@ -573,9 +574,10 @@ class Page(MP_Node, ClusterableModel, Indexed): page_copy = self.add_sibling(instance=page_copy) # Copy child objects - for child_relation in getattr(self._meta, 'child_relations', []): + specific_self = self.specific + for child_relation in getattr(specific_self._meta, 'child_relations', []): parental_key_name = child_relation.field.attname - child_objects = getattr(self, child_relation.get_accessor_name(), None) + child_objects = getattr(specific_self, child_relation.get_accessor_name(), None) if child_objects: for child_object in child_objects.all(): diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 3c67c3c69..a109816ab 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -258,6 +258,19 @@ class TestCopyPage(TestCase): # Check that the speakers weren't removed from old page self.assertEqual(christmas_event.speakers.count(), 1, "Child objects were removed from the original page") + def test_copy_page_copies_child_objects_with_nonspecific_class(self): + # Get chrismas page as Page instead of EventPage + christmas_event = Page.objects.get(url_path='/home/events/christmas/') + + # Copy it + new_christmas_event = christmas_event.copy(title="New christmas event", slug='new-christmas-event') + + # Check that the type of the new page is correct + self.assertIsInstance(new_christmas_event, EventPage) + + # Check that the speakers were copied + self.assertEqual(new_christmas_event.speakers.count(), 1, "Child objects weren't copied") + def test_copy_page_copies_recursively(self): events_index = EventIndex.objects.get(url_path='/home/events/') From bf03c05fa2a3a4734615c80be25e938f897cb908 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 26 Jun 2014 14:21:18 +0100 Subject: [PATCH 044/298] Changed **kwargs to update_attrs --- wagtail/wagtailcore/models.py | 7 ++++--- wagtail/wagtailcore/tests/test_page_model.py | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index e7cb616da..22d182284 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -556,7 +556,7 @@ class Page(MP_Node, ClusterableModel, Indexed): new_self.save() new_self._update_descendant_url_paths(old_url_path, new_url_path) - def copy(self, recursive=False, to=None, **update_fields): + def copy(self, recursive=False, to=None, update_attrs=None): # Make a copy page_copy = Page.objects.get(id=self.id).specific page_copy.pk = None @@ -565,8 +565,9 @@ class Page(MP_Node, ClusterableModel, Indexed): page_copy.numchild = 0 page_copy.path = None - for field, value in update_fields.items(): - setattr(page_copy, field, value) + if update_attrs: + for field, value in update_attrs.items(): + setattr(page_copy, field, value) if to: page_copy = to.add_child(instance=page_copy) diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index a109816ab..1b4ce76e8 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -233,7 +233,7 @@ class TestCopyPage(TestCase): about_us = SimplePage.objects.get(url_path='/home/about-us/') # Copy it - new_about_us = about_us.copy(title="New about us", slug='new-about-us') + new_about_us = about_us.copy(update_attrs={'title': "New about us", 'slug': 'new-about-us'}) # Check that new_about_us is correct self.assertIsInstance(new_about_us, SimplePage) @@ -250,7 +250,7 @@ class TestCopyPage(TestCase): christmas_event = EventPage.objects.get(url_path='/home/events/christmas/') # Copy it - new_christmas_event = christmas_event.copy(title="New christmas event", slug='new-christmas-event') + new_christmas_event = christmas_event.copy(update_attrs={'title': "New christmas event", 'slug': 'new-christmas-event'}) # Check that the speakers were copied self.assertEqual(new_christmas_event.speakers.count(), 1, "Child objects weren't copied") @@ -263,7 +263,7 @@ class TestCopyPage(TestCase): christmas_event = Page.objects.get(url_path='/home/events/christmas/') # Copy it - new_christmas_event = christmas_event.copy(title="New christmas event", slug='new-christmas-event') + new_christmas_event = christmas_event.copy(update_attrs={'title': "New christmas event", 'slug': 'new-christmas-event'}) # Check that the type of the new page is correct self.assertIsInstance(new_christmas_event, EventPage) @@ -275,7 +275,7 @@ class TestCopyPage(TestCase): events_index = EventIndex.objects.get(url_path='/home/events/') # Copy it - new_events_index = events_index.copy(recursive=True, title="New events index", slug='new-events-index') + new_events_index = events_index.copy(recursive=True, update_attrs={'title': "New events index", 'slug': 'new-events-index'}) # Get christmas event old_christmas_event = events_index.get_children().filter(slug='christmas').first() @@ -292,7 +292,7 @@ class TestCopyPage(TestCase): events_index = EventIndex.objects.get(url_path='/home/events/') # Copy it - new_events_index = events_index.copy(recursive=True, title="New events index", slug='new-events-index') + new_events_index = events_index.copy(recursive=True, update_attrs={'title': "New events index", 'slug': 'new-events-index'}) # Get christmas event old_christmas_event = events_index.get_children().filter(slug='christmas').first() From 40ac053e5d11c6fc47d2cee5e2f9f639c3248f60 Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Wed, 25 Jun 2014 10:58:05 +0100 Subject: [PATCH 045/298] Implement field validation for Site.is_default_site; resolves #289 --- wagtail/wagtailcore/models.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 40a10a9c5..c70113604 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -15,6 +15,7 @@ from django.contrib.auth.models import Group from django.conf import settings from django.template.response import TemplateResponse from django.utils.translation import ugettext_lazy as _ +from django.core.exceptions import ValidationError from treebeard.mp_tree import MP_Node @@ -63,6 +64,25 @@ class Site(models.Model): else: return 'http://%s:%d' % (self.hostname, self.port) + def clean_fields(self, exclude=None): + super(Site, self).clean_fields(exclude) + # Only one site can have the is_default_site flag set + try: + default = Site.objects.get(is_default_site=True) + except Site.DoesNotExist: + pass + except Site.MultipleObjectsReturned: + raise + else: + if self.is_default_site and self.pk != default.pk: + raise ValidationError( + {'is_default_site': [ + _("%(hostname)s is already configured as the default site. You must unset that before you can save this site as default.") + % { 'hostname': default.hostname } + ] + }, + ) + # clear the wagtail_site_root_paths cache whenever Site records are updated def save(self, *args, **kwargs): result = super(Site, self).save(*args, **kwargs) From 49cb5b10250fb28c746067fd66bbc8bfddc55785 Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Wed, 25 Jun 2014 11:02:52 +0100 Subject: [PATCH 046/298] Allow multiple sites with the same hostname but different ports; resolves #290 --- ...hostname__add_unique_site_hostname_port.py | 106 ++++++++++++++++++ wagtail/wagtailcore/models.py | 30 ++++- 2 files changed, 130 insertions(+), 6 deletions(-) create mode 100644 wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py diff --git a/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py b/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py new file mode 100644 index 000000000..16686e0a9 --- /dev/null +++ b/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py @@ -0,0 +1,106 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Removing unique constraint on 'Site', fields ['hostname'] + db.delete_unique(u'wagtailcore_site', ['hostname']) + + # Adding unique constraint on 'Site', fields ['hostname', 'port'] + db.create_unique(u'wagtailcore_site', ['hostname', 'port']) + + + def backwards(self, orm): + # Removing unique constraint on 'Site', fields ['hostname', 'port'] + db.delete_unique(u'wagtailcore_site', ['hostname', 'port']) + + # Adding unique constraint on 'Site', fields ['hostname'] + db.create_unique(u'wagtailcore_site', ['hostname']) + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'wagtailcore.grouppagepermission': { + 'Meta': {'object_name': 'GroupPagePermission'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': u"orm['wagtailcore.Page']"}), + 'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}) + }, + u'wagtailcore.page': { + 'Meta': {'object_name': 'Page'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + u'wagtailcore.pagerevision': { + 'Meta': {'object_name': 'PageRevision'}, + 'content_json': ('django.db.models.fields.TextField', [], {}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': u"orm['wagtailcore.Page']"}), + 'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + u'wagtailcore.site': { + 'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'}, + 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), + 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"}) + } + } + + complete_apps = ['wagtailcore'] \ No newline at end of file diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index c70113604..2b8cc36ec 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -31,11 +31,14 @@ class SiteManager(models.Manager): class Site(models.Model): - hostname = models.CharField(max_length=255, unique=True, db_index=True) + hostname = models.CharField(max_length=255, db_index=True) port = models.IntegerField(default=80, help_text=_("Set this to something other than 80 if you need a specific port number to appear in URLs (e.g. development on port 8000). Does not affect request handling (so port forwarding still works).")) root_page = models.ForeignKey('Page', related_name='sites_rooted_here') is_default_site = models.BooleanField(default=False, help_text=_("If true, this site will handle requests for all other hostnames that do not have a site entry of their own")) + class Meta: + unique_together = ('hostname', 'port') + def natural_key(self): return (self.hostname,) @@ -46,9 +49,25 @@ class Site(models.Model): def find_for_request(request): """Find the site object responsible for responding to this HTTP request object""" try: - hostname = request.META['HTTP_HOST'].split(':')[0] - # find a Site matching this specific hostname - return Site.objects.get(hostname=hostname) + try: + hostname, port = request.META['HTTP_HOST'].split(':') + except ValueError: + hostname = request.META['HTTP_HOST'] + port = '80' # FIXME do we want this default? + except KeyError: + # explicit routing straight to the final except clause + raise + try: + # find a Site matching this specific hostname + return Site.objects.get(hostname=hostname) + except Site.MultipleObjectsReturned: + try: + # as there were more than one, try matching by port too + return Site.objects.get(hostname=hostname, port=int(port)) + except Site.DoesNotExist: + # explicit acknowledgement that this is another route to + # the final except clause + raise except (Site.DoesNotExist, KeyError): # If no matching site exists, or request does not specify an HTTP_HOST (which # will often be the case for the Django test client), look for a catch-all Site. @@ -79,8 +98,7 @@ class Site(models.Model): {'is_default_site': [ _("%(hostname)s is already configured as the default site. You must unset that before you can save this site as default.") % { 'hostname': default.hostname } - ] - }, + ]} ) # clear the wagtail_site_root_paths cache whenever Site records are updated From eccb87d9a03e8021c0b55620db3cbcc34f4e02bb Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Wed, 25 Jun 2014 11:03:30 +0100 Subject: [PATCH 047/298] Add routing test for when two sites have the same hostname but different ports --- wagtail/wagtailcore/tests/test_page_model.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 1bae57952..cf9a8b7bc 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -16,6 +16,7 @@ class TestRouting(TestCase): default_site = Site.objects.get(is_default_site=True) events_page = Page.objects.get(url_path='/home/events/') events_site = Site.objects.create(hostname='events.example.com', root_page=events_page) + alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765') # requests without a Host: header should be directed to the default site request = HttpRequest() @@ -28,6 +29,12 @@ class TestRouting(TestCase): request.META['HTTP_HOST'] = 'events.example.com' self.assertEqual(Site.find_for_request(request), events_site) + # ports in the Host: header should be respected + request = HttpRequest() + request.path = '/' + request.META['HTTP_HOST'] = 'events.example.com:8765' + self.assertEqual(Site.find_for_request(request), alternate_port_events_site) + # requests with an unrecognised Host: header should be directed to the default site request = HttpRequest() request.path = '/' From ee9297b4453a1edeb6c21d29a3212f9689bb9b6c Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Fri, 27 Jun 2014 11:17:44 +0100 Subject: [PATCH 048/298] Update Site.objects.get_by_natural_key() to include port --- wagtail/wagtailcore/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 2b8cc36ec..4bf818fb0 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -26,8 +26,8 @@ from wagtail.wagtailsearch import Indexed, get_search_backend class SiteManager(models.Manager): - def get_by_natural_key(self, hostname): - return self.get(hostname=hostname) + def get_by_natural_key(self, hostname, port): + return self.get(hostname=hostname, port=port) class Site(models.Model): @@ -40,7 +40,7 @@ class Site(models.Model): unique_together = ('hostname', 'port') def natural_key(self): - return (self.hostname,) + return (self.hostname, self.port) def __unicode__(self): return self.hostname + ("" if self.port == 80 else (":%d" % self.port)) + (" [default]" if self.is_default_site else "") From 781aabad97bd5552eb00d9f2b36137b0c166fe62 Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Fri, 27 Jun 2014 11:18:11 +0100 Subject: [PATCH 049/298] Update Site.find_for_request to respect https --- wagtail/wagtailcore/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 4bf818fb0..59742ffb7 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -53,7 +53,7 @@ class Site(models.Model): hostname, port = request.META['HTTP_HOST'].split(':') except ValueError: hostname = request.META['HTTP_HOST'] - port = '80' # FIXME do we want this default? + port = '443' if request.is_secure() else '80' except KeyError: # explicit routing straight to the final except clause raise From 1ac20bc76653c3aa0104f70f8bdb91381df2dcc6 Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Fri, 27 Jun 2014 12:49:22 +0100 Subject: [PATCH 050/298] Change the way we lookup the request port --- wagtail/wagtailcore/models.py | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 59742ffb7..dd7e5ac8c 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -47,27 +47,26 @@ class Site(models.Model): @staticmethod def find_for_request(request): - """Find the site object responsible for responding to this HTTP request object""" + """ + Find the site object responsible for responding to this HTTP + request object. Try: + - unique hostname first + - then hostname and port + - if there is no matching hostname at all, or no matching + hostname:port combination, fall back to the unique default site, + or raise an exception + NB this means that high-numbered ports on an extant hostname may + still be routed to a different hostname which is set as the default + """ try: - try: - hostname, port = request.META['HTTP_HOST'].split(':') - except ValueError: - hostname = request.META['HTTP_HOST'] - port = '443' if request.is_secure() else '80' - except KeyError: - # explicit routing straight to the final except clause - raise + hostname = request.META['HTTP_HOST'].split(':')[0] # KeyError here goes to the final except clause try: # find a Site matching this specific hostname - return Site.objects.get(hostname=hostname) + return Site.objects.get(hostname=hostname) # Site.DoesNotExist here goes to the final except clause except Site.MultipleObjectsReturned: - try: - # as there were more than one, try matching by port too - return Site.objects.get(hostname=hostname, port=int(port)) - except Site.DoesNotExist: - # explicit acknowledgement that this is another route to - # the final except clause - raise + # as there were more than one, try matching by port too + port = request.META['SERVER_PORT'] # KeyError here goes to the final except clause + return Site.objects.get(hostname=hostname, port=int(port)) # Site.DoesNotExist here goes to the final except clause except (Site.DoesNotExist, KeyError): # If no matching site exists, or request does not specify an HTTP_HOST (which # will often be the case for the Django test client), look for a catch-all Site. From e87e9eebc27b3eded788d901024265216ef33887 Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Fri, 27 Jun 2014 12:50:49 +0100 Subject: [PATCH 051/298] Modify tests to include ports differently, add tests for unrecognised ports --- wagtail/wagtailcore/tests/test_page_model.py | 41 ++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index cf9a8b7bc..874b4bed3 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -17,6 +17,8 @@ class TestRouting(TestCase): events_page = Page.objects.get(url_path='/home/events/') events_site = Site.objects.create(hostname='events.example.com', root_page=events_page) alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765') + unrecognised_port = '8000' + unrecognised_hostname = 'unknown.site.com' # requests without a Host: header should be directed to the default site request = HttpRequest() @@ -26,21 +28,54 @@ class TestRouting(TestCase): # requests with a known Host: header should be directed to the specific site request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = 'events.example.com' + request.META['HTTP_HOST'] = events_site.hostname + request.META['SERVER_PORT'] = events_site.port self.assertEqual(Site.find_for_request(request), events_site) # ports in the Host: header should be respected request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = 'events.example.com:8765' + request.META['HTTP_HOST'] = alternate_port_events_site.hostname + request.META['SERVER_PORT'] = alternate_port_events_site.port self.assertEqual(Site.find_for_request(request), alternate_port_events_site) # requests with an unrecognised Host: header should be directed to the default site request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = 'unknown.example.com' + request.META['HTTP_HOST'] = unrecognised_hostname + request.META['SERVER_PORT'] = '80' self.assertEqual(Site.find_for_request(request), default_site) + # requests on an unrecognised port should be directed to the default site + request = HttpRequest() + request.path = '/' + request.META['HTTP_HOST'] = default_site.hostname + request.META['SERVER_PORT'] = unrecognised_port + self.assertEqual(Site.find_for_request(request), default_site) + + # requests with an unrecognised Host: header _and_ an unrecognised port + # hould be directed to the default site + request = HttpRequest() + request.path = '/' + request.META['HTTP_HOST'] = unrecognised_hostname + request.META['SERVER_PORT'] = unrecognised_port + self.assertEqual(Site.find_for_request(request), default_site) + + # requests on an unrecognised port should be directed to the default + # site, even if their hostname (but not port) matches another entry + request = HttpRequest() + request.path = '/' + request.META['HTTP_HOST'] = events_site.hostname + request.META['SERVER_PORT'] = unrecognised_port + self.assertEqual(Site.find_for_request(request), default_site) + + # port in the HTTP_HOST header is ignored + request = HttpRequest() + request.path = '/' + request.META['HTTP_HOST'] = "%s:%s" % (events_site.hostname, events_site.port) + request.META['SERVER_PORT'] = alternate_port_events_site.port + self.assertEqual(Site.find_for_request(request), alternate_port_events_site) + def test_urls(self): default_site = Site.objects.get(is_default_site=True) homepage = Page.objects.get(url_path='/home/') From 3cac8ea3875169b34ee7ed854800d1dbcec4320a Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Fri, 27 Jun 2014 16:19:10 +0100 Subject: [PATCH 052/298] Add test that requests on unrecognised ports are routed to the expected site if no ambiguity --- wagtail/wagtailcore/tests/test_page_model.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 874b4bed3..a9e9781b1 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -15,8 +15,10 @@ class TestRouting(TestCase): def test_find_site_for_request(self): default_site = Site.objects.get(is_default_site=True) events_page = Page.objects.get(url_path='/home/events/') + about_page = Page.objects.get(url_path='/home/about-us/') events_site = Site.objects.create(hostname='events.example.com', root_page=events_page) alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765') + about_site = Site.objects.create(hostname='about.example.com', root_page=about_page) unrecognised_port = '8000' unrecognised_hostname = 'unknown.site.com' @@ -61,8 +63,17 @@ class TestRouting(TestCase): request.META['SERVER_PORT'] = unrecognised_port self.assertEqual(Site.find_for_request(request), default_site) + # requests on an unrecognised port should be directed to the site with + # matching hostname if there is no ambiguity + request = HttpRequest() + request.path = '/' + request.META['HTTP_HOST'] = about_site.hostname + request.META['SERVER_PORT'] = unrecognised_port + self.assertEqual(Site.find_for_request(request), about_site) + # requests on an unrecognised port should be directed to the default - # site, even if their hostname (but not port) matches another entry + # site, even if their hostname (but not port) matches more than one + # other entry request = HttpRequest() request.path = '/' request.META['HTTP_HOST'] = events_site.hostname From 1aad1e55c287778ccff4d2da7fad24b175b8e30b Mon Sep 17 00:00:00 2001 From: Nick Smith Date: Fri, 27 Jun 2014 16:20:09 +0100 Subject: [PATCH 053/298] Refactor port/site tests into new test case and individual tests --- wagtail/wagtailcore/tests/test_page_model.py | 79 ++++++++++++-------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index a9e9781b1..41d47c4e0 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -9,83 +9,96 @@ from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy from wagtail.tests.models import EventPage, EventIndex, SimplePage -class TestRouting(TestCase): +class TestSiteRouting(TestCase): fixtures = ['test.json'] - def test_find_site_for_request(self): - default_site = Site.objects.get(is_default_site=True) + def setUp(self): + self.default_site = Site.objects.get(is_default_site=True) events_page = Page.objects.get(url_path='/home/events/') about_page = Page.objects.get(url_path='/home/about-us/') - events_site = Site.objects.create(hostname='events.example.com', root_page=events_page) - alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765') - about_site = Site.objects.create(hostname='about.example.com', root_page=about_page) - unrecognised_port = '8000' - unrecognised_hostname = 'unknown.site.com' + self.events_site = Site.objects.create(hostname='events.example.com', root_page=events_page) + self.alternate_port_events_site = Site.objects.create(hostname='events.example.com', root_page=events_page, port='8765') + self.about_site = Site.objects.create(hostname='about.example.com', root_page=about_page) + self.unrecognised_port = '8000' + self.unrecognised_hostname = 'unknown.site.com' + def test_no_host_header_routes_to_default_site(self): # requests without a Host: header should be directed to the default site request = HttpRequest() request.path = '/' - self.assertEqual(Site.find_for_request(request), default_site) + self.assertEqual(Site.find_for_request(request), self.default_site) + def test_valid_headers_route_to_specific_site(self): # requests with a known Host: header should be directed to the specific site request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = events_site.hostname - request.META['SERVER_PORT'] = events_site.port - self.assertEqual(Site.find_for_request(request), events_site) + request.META['HTTP_HOST'] = self.events_site.hostname + request.META['SERVER_PORT'] = self.events_site.port + self.assertEqual(Site.find_for_request(request), self.events_site) + def test_ports_in_request_headers_are_respected(self): # ports in the Host: header should be respected request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = alternate_port_events_site.hostname - request.META['SERVER_PORT'] = alternate_port_events_site.port - self.assertEqual(Site.find_for_request(request), alternate_port_events_site) + request.META['HTTP_HOST'] = self.alternate_port_events_site.hostname + request.META['SERVER_PORT'] = self.alternate_port_events_site.port + self.assertEqual(Site.find_for_request(request), self.alternate_port_events_site) + def test_unrecognised_host_header_routes_to_default_site(self): # requests with an unrecognised Host: header should be directed to the default site request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = unrecognised_hostname + request.META['HTTP_HOST'] = self.unrecognised_hostname request.META['SERVER_PORT'] = '80' - self.assertEqual(Site.find_for_request(request), default_site) + self.assertEqual(Site.find_for_request(request), self.default_site) - # requests on an unrecognised port should be directed to the default site + def test_unrecognised_port_and_default_host_routes_to_default_site(self): + # requests to the default host on an unrecognised port should be directed to the default site request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = default_site.hostname - request.META['SERVER_PORT'] = unrecognised_port - self.assertEqual(Site.find_for_request(request), default_site) + request.META['HTTP_HOST'] = self.default_site.hostname + request.META['SERVER_PORT'] = self.unrecognised_port + self.assertEqual(Site.find_for_request(request), self.default_site) + def test_unrecognised_port_and_unrecognised_host_routes_to_default_site(self): # requests with an unrecognised Host: header _and_ an unrecognised port # hould be directed to the default site request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = unrecognised_hostname - request.META['SERVER_PORT'] = unrecognised_port - self.assertEqual(Site.find_for_request(request), default_site) + request.META['HTTP_HOST'] = self.unrecognised_hostname + request.META['SERVER_PORT'] = self.unrecognised_port + self.assertEqual(Site.find_for_request(request), self.default_site) + def test_unrecognised_port_on_known_hostname_routes_there_if_no_ambiguity(self): # requests on an unrecognised port should be directed to the site with # matching hostname if there is no ambiguity request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = about_site.hostname - request.META['SERVER_PORT'] = unrecognised_port - self.assertEqual(Site.find_for_request(request), about_site) + request.META['HTTP_HOST'] = self.about_site.hostname + request.META['SERVER_PORT'] = self.unrecognised_port + self.assertEqual(Site.find_for_request(request), self.about_site) + def test_unrecognised_port_on_known_hostname_routes_to_default_site_if_ambiguity(self): # requests on an unrecognised port should be directed to the default # site, even if their hostname (but not port) matches more than one # other entry request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = events_site.hostname - request.META['SERVER_PORT'] = unrecognised_port - self.assertEqual(Site.find_for_request(request), default_site) + request.META['HTTP_HOST'] = self.events_site.hostname + request.META['SERVER_PORT'] = self.unrecognised_port + self.assertEqual(Site.find_for_request(request), self.default_site) + def test_port_in_http_host_header_is_ignored(self): # port in the HTTP_HOST header is ignored request = HttpRequest() request.path = '/' - request.META['HTTP_HOST'] = "%s:%s" % (events_site.hostname, events_site.port) - request.META['SERVER_PORT'] = alternate_port_events_site.port - self.assertEqual(Site.find_for_request(request), alternate_port_events_site) + request.META['HTTP_HOST'] = "%s:%s" % (self.events_site.hostname, self.events_site.port) + request.META['SERVER_PORT'] = self.alternate_port_events_site.port + self.assertEqual(Site.find_for_request(request), self.alternate_port_events_site) + + +class TestRouting(TestCase): + fixtures = ['test.json'] def test_urls(self): default_site = Site.objects.get(is_default_site=True) From 1736b8173c9cac3a7dac11f671a3dbc506e6764f Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 10:13:08 +0100 Subject: [PATCH 054/298] Put back some missing tests --- .../wagtailadmin/tests/test_pages_views.py | 181 ++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 65a614538..c069422fa 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -1,8 +1,11 @@ +from datetime import timedelta + from django.test import TestCase from django.core.urlresolvers import reverse from django.contrib.auth.models import User, Permission from django.core import mail from django.core.paginator import Paginator +from django.utils import timezone from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild, BusinessSubIndex from wagtail.tests.utils import unittest, WagtailTestUtils @@ -169,6 +172,58 @@ class TestPageCreation(TestCase, WagtailTestUtils): self.assertIsInstance(page, SimplePage) self.assertFalse(page.live) + def test_create_simplepage_scheduled(self): + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) + post_data = { + 'title': "New page!", + 'content': "Some content", + 'slug': 'hello-world', + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + # Find the page and check the scheduled times + page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific + self.assertEquals(page.go_live_at.date(), go_live_at.date()) + self.assertEquals(page.expire_at.date(), expire_at.date()) + self.assertEquals(page.expired, False) + self.assertTrue(page.status_string, "draft") + + # No revisions with approved_go_live_at + self.assertFalse(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists()) + + def test_create_simplepage_scheduled_go_live_before_expiry(self): + post_data = { + 'title': "New page!", + 'content': "Some content", + 'slug': 'hello-world', + 'go_live_at': str(timezone.now() + timedelta(days=2)).split('.')[0], + 'expire_at': str(timezone.now() + timedelta(days=1)).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 200) + self.assertTrue(response.context['edit_handler'].form.errors) + + def test_create_simplepage_scheduled_expire_in_the_past(self): + post_data = { + 'title': "New page!", + 'content': "Some content", + 'slug': 'hello-world', + 'expire_at': str(timezone.now() + timedelta(days=-1)).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 200) + self.assertTrue(response.context['edit_handler'].form.errors) + def test_create_simplepage_post_publish(self): post_data = { 'title': "New page!", @@ -187,6 +242,34 @@ class TestPageCreation(TestCase, WagtailTestUtils): self.assertIsInstance(page, SimplePage) self.assertTrue(page.live) + def test_create_simplepage_post_publish_scheduled(self): + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) + post_data = { + 'title': "New page!", + 'content': "Some content", + 'slug': 'hello-world', + 'action-publish': "Publish", + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + # Find the page and check it + page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific + self.assertEquals(page.go_live_at.date(), go_live_at.date()) + self.assertEquals(page.expire_at.date(), expire_at.date()) + self.assertEquals(page.expired, False) + + # A revision with approved_go_live_at should exist now + self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists()) + # But Page won't be live + self.assertFalse(page.live) + self.assertTrue(page.status_string, "scheduled") + def test_create_simplepage_post_submit(self): # Create a moderator user for testing email moderator = User.objects.create_superuser('moderator', 'moderator@email.com', 'password') @@ -327,6 +410,33 @@ class TestPageEdit(TestCase, WagtailTestUtils): child_page_new = SimplePage.objects.get(id=self.child_page.id) self.assertTrue(child_page_new.has_unpublished_changes) + def test_edit_post_scheduled(self): + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + child_page_new = SimplePage.objects.get(id=self.child_page.id) + + # The page will still be live + self.assertTrue(child_page_new.live) + + # A revision with approved_go_live_at should not exist + self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) + + # But a revision with go_live_at and expire_at in their content json *should* exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_at.date())).exists()) + self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expire_at.date())).exists()) + def test_page_edit_post_publish(self): # Tests publish from edit page post_data = { @@ -347,6 +457,77 @@ class TestPageEdit(TestCase, WagtailTestUtils): # The page shouldn't have "has_unpublished_changes" flag set self.assertFalse(child_page_new.has_unpublished_changes) + def test_edit_post_publish_scheduled(self): + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'action-publish': "Publish", + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + child_page_new = SimplePage.objects.get(id=self.child_page.id) + + # The page should not be live anymore + self.assertFalse(child_page_new.live) + + # Instead a revision with approved_go_live_at should now exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) + + def test_edit_post_publish_now_an_already_scheduled(self): + # First let's publish a page with a go_live_at in the future + go_live_at = timezone.now() + timedelta(days=1) + expire_at = timezone.now() + timedelta(days=2) + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'action-publish': "Publish", + 'go_live_at': str(go_live_at).split('.')[0], + 'expire_at': str(expire_at).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + child_page_new = SimplePage.objects.get(id=self.child_page.id) + + # The page should not be live anymore + self.assertFalse(child_page_new.live) + + # Instead a revision with approved_go_live_at should now exist + self.assertTrue(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) + + # Now, let's edit it and publish it right now + go_live_at = timezone.now() + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'action-publish': "Publish", + 'go_live_at': "", + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + # Should be redirected to explorer page + self.assertEqual(response.status_code, 302) + + child_page_new = SimplePage.objects.get(id=self.child_page.id) + + # The page should be live now + self.assertTrue(child_page_new.live) + + # And a revision with approved_go_live_at should not exist + self.assertFalse(PageRevision.objects.filter(page=child_page_new).exclude(approved_go_live_at__isnull=True).exists()) + def test_page_edit_post_submit(self): # Create a moderator user for testing email moderator = User.objects.create_superuser('moderator', 'moderator@email.com', 'password') From 61599b07dda2196d111985e07074def3da18064f Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 10:17:31 +0100 Subject: [PATCH 055/298] Made scheduled publish errors into field errors --- .../wagtailadmin/tests/test_pages_views.py | 41 +++++++++++++-- wagtail/wagtailadmin/views/pages.py | 52 +++++++++++++++++++ wagtail/wagtailcore/models.py | 11 ---- 3 files changed, 89 insertions(+), 15 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index c069422fa..848e1f967 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -207,9 +207,11 @@ class TestPageCreation(TestCase, WagtailTestUtils): } response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) - # Should be redirected to explorer page self.assertEqual(response.status_code, 200) - self.assertTrue(response.context['edit_handler'].form.errors) + + # Check that a form error was raised + self.assertFormError(response, 'form', 'go_live_at', "Go live date/time must be before expiry date/time") + self.assertFormError(response, 'form', 'expire_at', "Go live date/time must be before expiry date/time") def test_create_simplepage_scheduled_expire_in_the_past(self): post_data = { @@ -220,9 +222,10 @@ class TestPageCreation(TestCase, WagtailTestUtils): } response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data) - # Should be redirected to explorer page self.assertEqual(response.status_code, 200) - self.assertTrue(response.context['edit_handler'].form.errors) + + # Check that a form error was raised + self.assertFormError(response, 'form', 'expire_at', "Expiry date/time must be in the future") def test_create_simplepage_post_publish(self): post_data = { @@ -437,6 +440,36 @@ class TestPageEdit(TestCase, WagtailTestUtils): self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(go_live_at.date())).exists()) self.assertTrue(PageRevision.objects.filter(page=child_page_new, content_json__contains=str(expire_at.date())).exists()) + def test_edit_scheduled_go_live_before_expiry(self): + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'go_live_at': str(timezone.now() + timedelta(days=2)).split('.')[0], + 'expire_at': str(timezone.now() + timedelta(days=1)).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + self.assertEqual(response.status_code, 200) + + # Check that a form error was raised + self.assertFormError(response, 'form', 'go_live_at', "Go live date/time must be before expiry date/time") + self.assertFormError(response, 'form', 'expire_at', "Go live date/time must be before expiry date/time") + + def test_edit_scheduled_expire_in_the_past(self): + post_data = { + 'title': "I've been edited!", + 'content': "Some content", + 'slug': 'hello-world', + 'expire_at': str(timezone.now() + timedelta(days=-1)).split('.')[0], + } + response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data) + + self.assertEqual(response.status_code, 200) + + # Check that a form error was raised + self.assertFormError(response, 'form', 'expire_at', "Expiry date/time must be in the future") + def test_page_edit_post_publish(self): # Tests publish from edit page post_data = { diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index e6871b3ce..29f3b68bb 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -137,6 +137,32 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ return slug form.fields['slug'].clean = clean_slug + # Stick another validator into the form to check that the scheduled publishing settings are set correctly + def clean(): + cleaned_data = form_class.clean(form) + + # Go live must be before expire + go_live_at = cleaned_data.get('go_live_at') + expire_at = cleaned_data.get('expire_at') + + if go_live_at and expire_at: + if go_live_at > expire_at: + msg = _('Go live date/time must be before expiry date/time') + form._errors['go_live_at'] = form.error_class([msg]) + form._errors['expire_at'] = form.error_class([msg]) + del cleaned_data['go_live_at'] + del cleaned_data['expire_at'] + + # Expire must be in the future + expire_at = cleaned_data.get('expire_at') + + if expire_at and expire_at < timezone.now(): + form._errors['expire_at'] = form.error_class([_('Expiry date/time must be in the future')]) + del cleaned_data['expire_at'] + + return cleaned_data + form.clean = clean + if form.is_valid(): page = form.save(commit=False) # don't save yet, as we need treebeard to assign tree params @@ -230,6 +256,32 @@ def edit(request, page_id): return slug form.fields['slug'].clean = clean_slug + # Stick another validator into the form to check that the scheduled publishing settings are set correctly + def clean(): + cleaned_data = form_class.clean(form) + + # Go live must be before expire + go_live_at = cleaned_data.get('go_live_at') + expire_at = cleaned_data.get('expire_at') + + if go_live_at and expire_at: + if go_live_at > expire_at: + msg = _('Go live date/time must be before expiry date/time') + form._errors['go_live_at'] = form.error_class([msg]) + form._errors['expire_at'] = form.error_class([msg]) + del cleaned_data['go_live_at'] + del cleaned_data['expire_at'] + + # Expire must be in the future + expire_at = cleaned_data.get('expire_at') + + if expire_at and expire_at < timezone.now(): + form._errors['expire_at'] = form.error_class([_('Expiry date/time must be in the future')]) + del cleaned_data['expire_at'] + + return cleaned_data + form.clean = clean + if form.is_valid(): is_publishing = bool(request.POST.get('action-publish')) and page_perms.can_publish() is_submitting = bool(request.POST.get('action-submit')) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 702e1ebb0..19af022fe 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -8,7 +8,6 @@ from django.db import models, connection, transaction from django.db.models import get_model, Q from django.http import Http404 from django.core.cache import cache -from django.core.exceptions import ValidationError from django.core.handlers.wsgi import WSGIRequest from django.core.handlers.base import BaseHandler from django.contrib.contenttypes.models import ContentType @@ -466,16 +465,6 @@ class Page(MP_Node, ClusterableModel, Indexed): if self.url_path.startswith(root_path): return ('' if current_site.id == id else root_url) + self.url_path[len(root_path) - 1:] - def clean(self): - super(Page, self).clean() - - if self.go_live_at and self.expire_at: - if self.go_live_at > self.expire_at: - raise ValidationError(ugettext('Go live date/time should be before expiry datetime.')) - - if self.expire_at and self.expire_at < timezone.now(): - raise ValidationError(ugettext('Expiry date/time should be in the future')) - @classmethod def search(cls, query_string, show_unpublished=False, search_title_only=False, extra_filters={}, prefetch_related=[], path=None): # Filters From 0cec7587cefb49d12e2a255ea0422ce98b22eea2 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 10:20:43 +0100 Subject: [PATCH 056/298] Removed some unneeded code --- wagtail/wagtailadmin/views/pages.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 29f3b68bb..84137f363 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -210,10 +210,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ return redirect('wagtailadmin_explore', page.get_parent().id) else: - if form.errors and form.errors.get('__all__'): - messages.error(request, _("The page could not be created: ") + ', '.join(form.errors['__all__'])) - else: - messages.error(request, _("The page could not be created due to errors.")) + messages.error(request, _("The page could not be created due to validation errors")) edit_handler = edit_handler_class(instance=page, form=form) else: signals.init_new_page.send(sender=create, page=page, parent=parent_page) @@ -336,10 +333,7 @@ def edit(request, page_id): return redirect('wagtailadmin_explore', page.get_parent().id) else: - if form.errors and form.errors.get('__all__'): - messages.error(request, _("The page could not be saved: ") + ', '.join(form.errors['__all__'])) - else: - messages.error(request, _("The page could not be saved due to validation errors")) + messages.error(request, _("The page could not be saved due to validation errors")) edit_handler = edit_handler_class(instance=page, form=form) errors_debug = ( From 42037419b07c665d5e80213d51160560370056b9 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 10:29:17 +0100 Subject: [PATCH 057/298] Removed duplicate test --- .../tests/test_management_commands.py | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/wagtail/wagtailcore/tests/test_management_commands.py b/wagtail/wagtailcore/tests/test_management_commands.py index 93315c33e..ae19167c2 100644 --- a/wagtail/wagtailcore/tests/test_management_commands.py +++ b/wagtail/wagtailcore/tests/test_management_commands.py @@ -117,27 +117,6 @@ class TestPublishScheduledPagesCommand(TestCase): self.assertTrue(p.live) self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - def test_go_live_page_will_be_published(self): - page = SimplePage( - title="Hello world!", - slug="hello-world", - live=False, - go_live_at=timezone.now() - timedelta(days=1), - ) - self.root_page.add_child(instance=page) - - page.save_revision(approved_go_live_at=timezone.now() - timedelta(days=1)) - - p = Page.objects.get(slug='hello-world') - self.assertFalse(p.live) - self.assertTrue(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - - management.call_command('publish_scheduled_pages') - - p = Page.objects.get(slug='hello-world') - self.assertTrue(p.live) - self.assertFalse(PageRevision.objects.filter(page=p).exclude(approved_go_live_at__isnull=True).exists()) - def test_future_go_live_page_will_not_be_published(self): page = SimplePage( title="Hello world!", From 1142123174b41f28d3e2bf03e9f460866de68fc8 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 13:34:37 +0100 Subject: [PATCH 058/298] Added basic documentation for management commands --- docs/management_commands.rst | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 docs/management_commands.rst diff --git a/docs/management_commands.rst b/docs/management_commands.rst new file mode 100644 index 000000000..e5f6393f7 --- /dev/null +++ b/docs/management_commands.rst @@ -0,0 +1,59 @@ +Management commands +=================== + +publish_scheduled_pages +----------------------- + +**./manage.py publish_scheduled_pages** + +This command publishes/unpublishes pages that have had these actions scheduled by an editor. + +It is recommended to run this command once an hour. + + +fixtree +------- + +**./manage.py fixtree** + +This command scans for errors in your database and attempts to fix any issues it finds. + + +move_pages +---------- + +**./manage.py move_pages from to** + +This mass moves a bunch of pages from one section of the tree to another. + +Options: + + - **from** + This is id of the page to move pages from. All descendants of this page will be moved to the destination. After the operation is complete, this page will have no children. + + - **to** + This is the id of the page to move pages to. + + +update_index +------------ + +**./manage.py update_index** + +This command rebuilds the search index from scratch. It is only required when using ElasticSearch. + +It is recommended to run this command once a week and at the following times: + - Whenever any pages have been created through a script (eg, import) + - Whenever any changes have been made to models or search configuration + +While this command is running, the search may not return any results so avoid running this command at peak times. + + +search_garbage_collect +---------------------- + +**./manage.py search_garbage_collect** + +Wagtail keeps a log of search queries that are popular on your website. On high traffic websites, this log may get big and sometimes you may want to clean out old search queries. + +This command cleans out all search query logs that are more than one week old. From 865459e5eb5055a0959bab43227b5c00fbb8e9fe Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 14:16:46 +0100 Subject: [PATCH 059/298] Added page_published signal --- .../wagtailadmin/tests/test_pages_views.py | 26 +++++++++++++++++++ wagtail/wagtailadmin/views/pages.py | 3 +++ wagtail/wagtailcore/signals.py | 4 +++ 3 files changed, 33 insertions(+) create mode 100644 wagtail/wagtailcore/signals.py diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index aa73e907d..963a048b2 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -7,6 +7,7 @@ from django.core.paginator import Paginator from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild, BusinessSubIndex from wagtail.tests.utils import unittest, WagtailTestUtils from wagtail.wagtailcore.models import Page, PageRevision +from wagtail.wagtailcore.signals import page_published from wagtail.wagtailusers.models import UserProfile @@ -170,6 +171,15 @@ class TestPageCreation(TestCase, WagtailTestUtils): self.assertFalse(page.live) def test_create_simplepage_post_publish(self): + # Connect a mock signal handler to page_published signal + signal_fired = [False] + signal_page = [None] + def page_published_handler(sender, page, **kwargs): + signal_fired[0] = True + signal_page[0] = page + page_published.connect(page_published_handler) + + # Post post_data = { 'title': "New page!", 'content': "Some content", @@ -187,6 +197,10 @@ class TestPageCreation(TestCase, WagtailTestUtils): self.assertIsInstance(page, SimplePage) self.assertTrue(page.live) + # Check that the page_published signal was fired + self.assertTrue(signal_fired[0]) + self.assertEqual(signal_page[0], page) + def test_create_simplepage_post_submit(self): # Create a moderator user for testing email moderator = User.objects.create_superuser('moderator', 'moderator@email.com', 'password') @@ -327,6 +341,14 @@ class TestPageEdit(TestCase, WagtailTestUtils): self.assertTrue(child_page_new.has_unpublished_changes) def test_page_edit_post_publish(self): + # Connect a mock signal handler to page_published signal + signal_fired = [False] + signal_page = [None] + def page_published_handler(sender, page, **kwargs): + signal_fired[0] = True + signal_page[0] = page + page_published.connect(page_published_handler) + # Tests publish from edit page post_data = { 'title': "I've been edited!", @@ -343,6 +365,10 @@ class TestPageEdit(TestCase, WagtailTestUtils): child_page_new = SimplePage.objects.get(id=self.child_page.id) self.assertEqual(child_page_new.title, post_data['title']) + # Check that the page_published signal was fired + self.assertTrue(signal_fired[0]) + self.assertEqual(signal_page[0], child_page_new) + # The page shouldn't have "has_unpublished_changes" flag set self.assertFalse(child_page_new.has_unpublished_changes) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index f6490a224..d49864f44 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -13,6 +13,7 @@ from wagtail.wagtailadmin.forms import SearchForm from wagtail.wagtailadmin import tasks, hooks, signals from wagtail.wagtailcore.models import Page, PageRevision +from wagtail.wagtailcore.signals import page_published @permission_required('wagtailadmin.access_admin') @@ -158,6 +159,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ page.save_revision(user=request.user, submitted_for_moderation=is_submitting) if is_publishing: + page_published.send(sender=page_class, page=page) messages.success(request, _("Page '{0}' published.").format(page.title)) elif is_submitting: messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title)) @@ -238,6 +240,7 @@ def edit(request, page_id): page.save_revision(user=request.user, submitted_for_moderation=is_submitting) if is_publishing: + page_published.send(sender=page.__class__, page=page) messages.success(request, _("Page '{0}' published.").format(page.title)) elif is_submitting: messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title)) diff --git a/wagtail/wagtailcore/signals.py b/wagtail/wagtailcore/signals.py new file mode 100644 index 000000000..38a0809c8 --- /dev/null +++ b/wagtail/wagtailcore/signals.py @@ -0,0 +1,4 @@ +from django.dispatch import Signal + + +page_published = Signal(providing_args=['page']) From de229914f00d9e21209e475a0b5542deeb82bf24 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 14:22:55 +0100 Subject: [PATCH 060/298] Fire page_published signal on moderation approval --- wagtail/wagtailadmin/tests/test_pages_views.py | 15 +++++++++++++++ wagtail/wagtailadmin/views/pages.py | 1 + 2 files changed, 16 insertions(+) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 963a048b2..1bab3b137 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -200,6 +200,7 @@ class TestPageCreation(TestCase, WagtailTestUtils): # Check that the page_published signal was fired self.assertTrue(signal_fired[0]) self.assertEqual(signal_page[0], page) + self.assertEqual(signal_page[0], signal_page[0].specific) def test_create_simplepage_post_submit(self): # Create a moderator user for testing email @@ -368,6 +369,7 @@ class TestPageEdit(TestCase, WagtailTestUtils): # Check that the page_published signal was fired self.assertTrue(signal_fired[0]) self.assertEqual(signal_page[0], child_page_new) + self.assertEqual(signal_page[0], signal_page[0].specific) # The page shouldn't have "has_unpublished_changes" flag set self.assertFalse(child_page_new.has_unpublished_changes) @@ -667,6 +669,14 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils): """ This posts to the approve moderation view and checks that the page was approved """ + # Connect a mock signal handler to page_published signal + signal_fired = [False] + signal_page = [None] + def page_published_handler(sender, page, **kwargs): + signal_fired[0] = True + signal_page[0] = page + page_published.connect(page_published_handler) + # Post response = self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(self.revision.id, )), { 'foo': "Must post something or the view won't see this as a POST request", @@ -678,6 +688,11 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils): # Page must be live self.assertTrue(Page.objects.get(id=self.page.id).live) + # Check that the page_published signal was fired + self.assertTrue(signal_fired[0]) + self.assertEqual(signal_page[0], self.page) + self.assertEqual(signal_page[0], signal_page[0].specific) + def test_approve_moderation_view_bad_revision_id(self): """ This tests that the approve moderation view handles invalid revision ids correctly diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index d49864f44..f829df9c5 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -609,6 +609,7 @@ def approve_moderation(request, revision_id): if request.POST: revision.publish() + page_published.send(sender=revision.page.__class__, page=revision.page.specific) messages.success(request, _("Page '{0}' published.").format(revision.page.title)) tasks.send_notification.delay(revision.id, 'approved', request.user.id) From 02daf67daf33ee1ff706b396f92d06b676217f6f Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 14:32:18 +0100 Subject: [PATCH 061/298] Renamed 'page' argument of page_published signal to 'instance' This is to give more consistancy with djangos built in signals --- wagtail/wagtailadmin/tests/test_pages_views.py | 12 ++++++------ wagtail/wagtailadmin/views/pages.py | 6 +++--- wagtail/wagtailcore/signals.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 1bab3b137..a26feee9c 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -174,9 +174,9 @@ class TestPageCreation(TestCase, WagtailTestUtils): # Connect a mock signal handler to page_published signal signal_fired = [False] signal_page = [None] - def page_published_handler(sender, page, **kwargs): + def page_published_handler(sender, instance, **kwargs): signal_fired[0] = True - signal_page[0] = page + signal_page[0] = instance page_published.connect(page_published_handler) # Post @@ -345,9 +345,9 @@ class TestPageEdit(TestCase, WagtailTestUtils): # Connect a mock signal handler to page_published signal signal_fired = [False] signal_page = [None] - def page_published_handler(sender, page, **kwargs): + def page_published_handler(sender, instance, **kwargs): signal_fired[0] = True - signal_page[0] = page + signal_page[0] = instance page_published.connect(page_published_handler) # Tests publish from edit page @@ -672,9 +672,9 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils): # Connect a mock signal handler to page_published signal signal_fired = [False] signal_page = [None] - def page_published_handler(sender, page, **kwargs): + def page_published_handler(sender, instance, **kwargs): signal_fired[0] = True - signal_page[0] = page + signal_page[0] = instance page_published.connect(page_published_handler) # Post diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index f829df9c5..3f41bbc2b 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -159,7 +159,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ page.save_revision(user=request.user, submitted_for_moderation=is_submitting) if is_publishing: - page_published.send(sender=page_class, page=page) + page_published.send(sender=page_class, instance=page) messages.success(request, _("Page '{0}' published.").format(page.title)) elif is_submitting: messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title)) @@ -240,7 +240,7 @@ def edit(request, page_id): page.save_revision(user=request.user, submitted_for_moderation=is_submitting) if is_publishing: - page_published.send(sender=page.__class__, page=page) + page_published.send(sender=page.__class__, instance=page) messages.success(request, _("Page '{0}' published.").format(page.title)) elif is_submitting: messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title)) @@ -609,7 +609,7 @@ def approve_moderation(request, revision_id): if request.POST: revision.publish() - page_published.send(sender=revision.page.__class__, page=revision.page.specific) + page_published.send(sender=revision.page.__class__, instance=revision.page.specific) messages.success(request, _("Page '{0}' published.").format(revision.page.title)) tasks.send_notification.delay(revision.id, 'approved', request.user.id) diff --git a/wagtail/wagtailcore/signals.py b/wagtail/wagtailcore/signals.py index 38a0809c8..2508759c6 100644 --- a/wagtail/wagtailcore/signals.py +++ b/wagtail/wagtailcore/signals.py @@ -1,4 +1,4 @@ from django.dispatch import Signal -page_published = Signal(providing_args=['page']) +page_published = Signal(providing_args=['instance']) From 000b8abafe22cc7df66d6221b51782daa79354f4 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 19 Jun 2014 15:52:34 +0100 Subject: [PATCH 062/298] Added frontend cache purger --- .../contrib/wagtailfrontendcache/__init__.py | 0 .../contrib/wagtailfrontendcache/models.py | 0 .../contrib/wagtailfrontendcache/purger.py | 14 +++++++++++ .../wagtailfrontendcache/signal_handlers.py | 24 +++++++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 wagtail/contrib/wagtailfrontendcache/__init__.py create mode 100644 wagtail/contrib/wagtailfrontendcache/models.py create mode 100644 wagtail/contrib/wagtailfrontendcache/purger.py create mode 100644 wagtail/contrib/wagtailfrontendcache/signal_handlers.py diff --git a/wagtail/contrib/wagtailfrontendcache/__init__.py b/wagtail/contrib/wagtailfrontendcache/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/contrib/wagtailfrontendcache/models.py b/wagtail/contrib/wagtailfrontendcache/models.py new file mode 100644 index 000000000..e69de29bb diff --git a/wagtail/contrib/wagtailfrontendcache/purger.py b/wagtail/contrib/wagtailfrontendcache/purger.py new file mode 100644 index 000000000..ca00408e2 --- /dev/null +++ b/wagtail/contrib/wagtailfrontendcache/purger.py @@ -0,0 +1,14 @@ +from urlparse import urlparse, urlunparse +import requests + +from django.conf import settings + + +def purge_page_from_cache(page): + # Build purge url + varnish_url = urlparse(getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/')) + page_url = urlparse(page.url) + purge_url = urlunparse((varnish_url.scheme, varnish_url.netloc, page_url.path, page_url.params, page_url.query, page_url.fragment)) + + # Purge + requests.request('PURGE', purge_url) diff --git a/wagtail/contrib/wagtailfrontendcache/signal_handlers.py b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py new file mode 100644 index 000000000..7f5dde81b --- /dev/null +++ b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py @@ -0,0 +1,24 @@ +from django.db import models +from django.db.models.signals import post_save, post_delete + +from wagtail.wagtailcore.models import Page + +from wagtail.contrib.wagtailfrontendcache import purger + + +def post_save_signal_handler(instance, **kwargs): + purger.purge_page_from_cache(instance) + + +def post_delete_signal_handler(instance, **kwargs): + purger.purge_page_from_cache(instance) + + +def register_signal_handlers(): + # Get list of models that are page types + indexed_models = [model for model in models.get_models() if issubclass(model, Page)] + + # Loop through list and register signal handlers for each one + for model in indexed_models: + post_save.connect(post_save_signal_handler, sender=model) + post_delete.connect(post_delete_signal_handler, sender=model) From cd21dbc21a862ad3042694a383fe4aaaa5148fb6 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 24 Jun 2014 11:13:30 +0100 Subject: [PATCH 063/298] Added requests as a dependency --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 7b26817cd..8ee251154 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ setup( "lxml>=3.3.0", 'unicodecsv>=0.9.4', 'Unidecode>=0.04.14', + 'requests==2.3.0', "BeautifulSoup==3.2.1", # django-compressor gets confused if we have lxml but not BS3 installed ], zip_safe=False, From d667836188b49209bf766b009bb0913829e6f3ad Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 24 Jun 2014 12:17:37 +0100 Subject: [PATCH 064/298] Fixes to the 'purger' module --- .../contrib/wagtailfrontendcache/purger.py | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/wagtail/contrib/wagtailfrontendcache/purger.py b/wagtail/contrib/wagtailfrontendcache/purger.py index ca00408e2..250f62840 100644 --- a/wagtail/contrib/wagtailfrontendcache/purger.py +++ b/wagtail/contrib/wagtailfrontendcache/purger.py @@ -1,14 +1,33 @@ -from urlparse import urlparse, urlunparse import requests +from requests.adapters import HTTPAdapter from django.conf import settings +class CustomHTTPAdapter(HTTPAdapter): + """ + Requests will always send requests to whatever server is in the netloc + part of the URL. This is a problem with purging the cache as this netloc + may point to a different server (such as an nginx instance running in + front of the cache). + + This class allows us to send a purge request directly to the cache server + with the host header still set correctly. It does this by changing the "url" + parameter of get_connection to always point to the cache server. Requests + will then use this connection to purge the page. + """ + def __init__(self, cache_url): + self.cache_url = cache_url + super(CustomHTTPAdapter, self).__init__() + + def get_connection(self, url, proxies=None): + return super(CustomHTTPAdapter, self).get_connection(self.cache_url, proxies) + + def purge_page_from_cache(page): - # Build purge url - varnish_url = urlparse(getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/')) - page_url = urlparse(page.url) - purge_url = urlunparse((varnish_url.scheme, varnish_url.netloc, page_url.path, page_url.params, page_url.query, page_url.fragment)) + varnish_url = getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/') # Purge - requests.request('PURGE', purge_url) + session = requests.Session() + session.mount('http://', CustomHTTPAdapter(varnish_url)) + session.request('PURGE', page.full_url) From 9c4ac7fc3164d14ac99feb73dfbc07135db8375e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 24 Jun 2014 12:18:44 +0100 Subject: [PATCH 065/298] Renamed 'wagtailfrontendcache.purger' to 'wagtailfrontendcache.utils' --- wagtail/contrib/wagtailfrontendcache/signal_handlers.py | 6 +++--- .../contrib/wagtailfrontendcache/{purger.py => utils.py} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename wagtail/contrib/wagtailfrontendcache/{purger.py => utils.py} (100%) diff --git a/wagtail/contrib/wagtailfrontendcache/signal_handlers.py b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py index 7f5dde81b..ce23d9839 100644 --- a/wagtail/contrib/wagtailfrontendcache/signal_handlers.py +++ b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py @@ -3,15 +3,15 @@ from django.db.models.signals import post_save, post_delete from wagtail.wagtailcore.models import Page -from wagtail.contrib.wagtailfrontendcache import purger +from wagtail.contrib.wagtailfrontendcache.utils import purge_page_from_cache def post_save_signal_handler(instance, **kwargs): - purger.purge_page_from_cache(instance) + purge_page_from_cache(instance) def post_delete_signal_handler(instance, **kwargs): - purger.purge_page_from_cache(instance) + purge_page_from_cache(instance) def register_signal_handlers(): diff --git a/wagtail/contrib/wagtailfrontendcache/purger.py b/wagtail/contrib/wagtailfrontendcache/utils.py similarity index 100% rename from wagtail/contrib/wagtailfrontendcache/purger.py rename to wagtail/contrib/wagtailfrontendcache/utils.py From 341f53511625914d14321d37ad23efb5c51c4afa Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 24 Jun 2014 12:37:37 +0100 Subject: [PATCH 066/298] Allow purging of subpaths of pages --- wagtail/contrib/wagtailfrontendcache/utils.py | 8 +++++--- wagtail/wagtailcore/models.py | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/wagtail/contrib/wagtailfrontendcache/utils.py b/wagtail/contrib/wagtailfrontendcache/utils.py index 250f62840..9737ebbb0 100644 --- a/wagtail/contrib/wagtailfrontendcache/utils.py +++ b/wagtail/contrib/wagtailfrontendcache/utils.py @@ -25,9 +25,11 @@ class CustomHTTPAdapter(HTTPAdapter): def purge_page_from_cache(page): + # Get session varnish_url = getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/') - - # Purge session = requests.Session() session.mount('http://', CustomHTTPAdapter(varnish_url)) - session.request('PURGE', page.full_url) + + # Purge paths from cache + for path in page.get_cached_paths(): + session.request('PURGE', page.full_url + path[1:]) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index ee34ecf26..04a05a42c 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -629,13 +629,27 @@ class Page(MP_Node, ClusterableModel, Indexed): """ return self.serve(self.dummy_request()) + def get_internal_paths(self): + """ + This returns a list of paths within this page. + This is used for static sites, sitemaps and cache invalidation. + """ + return ['/'] + + def get_cached_paths(self): + """ + This returns a list of paths to invalidate in a frontend cache + """ + return self.get_internal_paths() + def get_static_site_paths(self): """ This is a generator of URL paths to feed into a static site generator Override this if you would like to create static versions of subpages """ - # Yield paths for this page - yield '/' + # Yield paths for this page + for url in self.get_internal_paths(): + yield url # Yield paths for child pages for child in self.get_children().live(): From 23a85311facc451bccbfa8fd0adaa528cc79ca0b Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 13:49:46 +0100 Subject: [PATCH 067/298] Renamed varnish_url variable to cache_serve_url --- wagtail/contrib/wagtailfrontendcache/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/contrib/wagtailfrontendcache/utils.py b/wagtail/contrib/wagtailfrontendcache/utils.py index 9737ebbb0..b95ed7e95 100644 --- a/wagtail/contrib/wagtailfrontendcache/utils.py +++ b/wagtail/contrib/wagtailfrontendcache/utils.py @@ -26,9 +26,9 @@ class CustomHTTPAdapter(HTTPAdapter): def purge_page_from_cache(page): # Get session - varnish_url = getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/') + cache_server_url = getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/') session = requests.Session() - session.mount('http://', CustomHTTPAdapter(varnish_url)) + session.mount('http://', CustomHTTPAdapter(cache_server_url)) # Purge paths from cache for path in page.get_cached_paths(): From 5709a160e6aad62bcdd8ae35c1b8bf9e8a6f7b6c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 30 Jun 2014 14:35:07 +0100 Subject: [PATCH 068/298] Use page_published signal for cache invalidation instead of post_save --- wagtail/contrib/wagtailfrontendcache/signal_handlers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wagtail/contrib/wagtailfrontendcache/signal_handlers.py b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py index ce23d9839..0fc92d46e 100644 --- a/wagtail/contrib/wagtailfrontendcache/signal_handlers.py +++ b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py @@ -1,12 +1,13 @@ from django.db import models -from django.db.models.signals import post_save, post_delete +from django.db.models.signals import post_delete from wagtail.wagtailcore.models import Page +from wagtail.wagtailcore.signals import page_published from wagtail.contrib.wagtailfrontendcache.utils import purge_page_from_cache -def post_save_signal_handler(instance, **kwargs): +def page_published_signal_handler(instance, **kwargs): purge_page_from_cache(instance) @@ -20,5 +21,5 @@ def register_signal_handlers(): # Loop through list and register signal handlers for each one for model in indexed_models: - post_save.connect(post_save_signal_handler, sender=model) + page_published.connect(page_published_signal_handler, sender=model) post_delete.connect(post_delete_signal_handler, sender=model) From 683f1cfa64e19639820a5bf53f48e1bd72b095bc Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 10:14:34 +0100 Subject: [PATCH 069/298] Added docs for sitemaps --- docs/sitemap_generation.rst | 58 +++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 docs/sitemap_generation.rst diff --git a/docs/sitemap_generation.rst b/docs/sitemap_generation.rst new file mode 100644 index 000000000..3308a8f4c --- /dev/null +++ b/docs/sitemap_generation.rst @@ -0,0 +1,58 @@ +Sitemap generation +================== + +This document describes how to create XML sitemaps for your Wagtail website using the ``wagtail.contrib.wagtailsitemaps`` module. + + +Basic configuration +~~~~~~~~~~~~~~~~~~~ + +You firstly need to add ``"wagtail.contrib.wagtailsitemaps"`` to INSTALLED_APPS in your Django settings file: + + .. code-block:: python + + INSTALLED_APPS = [ + ... + + "wagtail.contrib.wagtailsitemaps", + ] + + +Then, in urls.py, you need to add a link to the ``wagtail.contrib.wagtailsitemaps.views.sitemap`` view which generates the sitemap: + +.. code-block:: python + + from wagtail.contrib.wagtailsitemaps.views import sitemap + + urlpatterns = patterns('', + ... + + url('^sitemap\.xml$', sitemap), + ) + + +You should now be able to browse to "/sitemap.xml" and see the sitemap working. + + +Customising +~~~~~~~~~~~ + +URLs +---- + +The Page class defines a ``get_sitemap_urls`` method which you can override to customise sitemaps per page type. This method must return a list of dictionaries, one dictionary per URL entry in the sitemap. You can exclude pages from the sitemap by returning an empty list. + +Each dictionary can contain the following: + + - **location** (required) - This is the full URL path to add into the sitemap. + - **lastmod** - A python date or datetime set to when the page was last modified. + - **changefreq** + - **priority** + +You can add more but you will need to override the ``wagtailsitemaps/sitemap.xml`` template in order for them to be displayed in the sitemap. + + +Cache +----- + +By default, sitemaps are cached for 100 minutes. You can change this by setting ``WAGTAILSITEMAPS_CACHE_TIMEOUT`` in your Django settings to the number of seconds you would like to cache to last for. From 8daf1c6de64ae96fc2e07a84189e924cdd505ade Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 11:00:55 +0100 Subject: [PATCH 070/298] Added docs for frontend cache purging --- docs/frontend_cache_purging.rst | 102 ++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 docs/frontend_cache_purging.rst diff --git a/docs/frontend_cache_purging.rst b/docs/frontend_cache_purging.rst new file mode 100644 index 000000000..1825e92d2 --- /dev/null +++ b/docs/frontend_cache_purging.rst @@ -0,0 +1,102 @@ +Frontend cache purging +====================== + +Many websites use a frontend cache such as Varnish, Squid or Cloudflare to gain extra performance. The downside of using a frontend cache though is that they don't respond well to updating content and will often keep an old version of a page cached after it has been updated. + +This document describes how to configure Wagtail to purge old versions of pages from a frontend cache whenever a page gets updated. + + +Setting it up +~~~~~~~~~~~~~ + +Firstly, add ``"wagtail.contrib.wagtailfrontendcache"`` to your INSTALLED_APPS: + + .. code-block:: python + + INSTALLED_APPS = [ + ... + + "wagtail.contrib.wagtailfrontendcache" + ] + + +The ``wagtailfrontendcache`` module provides a set of signal handlers which will automatically purge the cache whenever a page is published or deleted. You should register these somewhere at the top of your ``urls.py`` file: + +.. code-block:: python + + # urls.py + from wagtail.contrib.wagtailfrontendcache.signal_handlers import register_signal_handlers + + register_signal_handlers() + + +You then need to set the ``WAGTAILFRONTENDCACHE_LOCATION`` setting to the URL of your Varnish/Squid cache server. This must be a direct connection to the server and cannot go through another proxy. By default, this is set to ``http://127.0.0.1:8000`` which is very likely incorrect. + +Finally, make sure you have configured your frontend cache to accept PURGE requests: + + - `Varnish `_ + - `Squid `_ + + +Advanced useage +~~~~~~~~~~~~~~~ + +Purging more than one URL per page +---------------------------------- + +By default, Wagtail will only purge one URL per page. If your page has more than one URL to be purged, you will need to override the ``get_cached_paths`` method on your page type. + +.. code-block:: python + + class BlogIndexPage(Page): + def get_blog_items(self): + # This returns a Django paginator of blog items in this section + return Paginator(self.get_children().live().type(BlogPage), 10) + + def get_cached_paths(self): + # Yield the main URL + yield '/' + + # Yield one URL per page in the paginator to make sure all pages are purged + for page_number in range(1, self.get_blog_items().num_pages): + yield '/?page=' + str(page_number) + + +Purging index pages +------------------- + +Another problem is pages that list other pages (such as a blog index) will not be purged when a blog entry gets added, changed or deleted. You may want to purge the blog index page so the updates are added into the listing quickly. + +This can be solved by using the ``purge_page_from_cache`` utility function which can be found in the ``wagtail.contrib.wagtailfrontendcache.utils`` module. + +Lets take the the above BlogIndexPage as an example. We need to register a signal handler to run when one of the BlogPages get updated/deleted. This signal handler should call the ``purge_page_from_cache`` function on all BlogIndexPages that contain the BlogPage being updated/deleted. + + +.. code-block:: python + + # models.py + from django.db.models.signals import pre_delete + + from wagtail.wagtailcore.signals import page_published + from wagtail.contrib.wagtailfrontendcache.utils import purge_page_from_cache + + + ... + + + def blog_page_changed(blog_page): + # Find all the live BlogIndexPages that contain this blog_page + for blog_index in BlogIndexPage.objects.live(): + if blog_page in blog_index.get_blog_items().object_list: + # Purge this blog index + purge_page_from_cache(blog_index) + + + @register(page_published, sender=BlogPage): + def blog_published_handler(instance): + blog_page_changed(instance) + + + @register(pre_delete, sender=BlogPage) + def blog_deleted_handler(instance): + blog_page_changed(instance) From 5f1eee4f46b59a6806e7d9947c8a711456efda79 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 1 Jul 2014 13:31:55 +0100 Subject: [PATCH 071/298] updated docs re: FieldRowPanel --- docs/editing_api.rst | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/docs/editing_api.rst b/docs/editing_api.rst index 33620fbca..c32b54d35 100644 --- a/docs/editing_api.rst +++ b/docs/editing_api.rst @@ -1,5 +1,5 @@ -Editing API +Defining models with the Editing API =========== .. note:: @@ -22,18 +22,30 @@ Defining Panels A "panel" is the basic editing block in Wagtail. Wagtail will automatically pick the appropriate editing widget for most Django field types, you just need to add a panel for each field you want to show in the Wagtail page editor, in the order you want them to appear. -There are three types of panels: - +There are four basic types of panels: + ``FieldPanel( field_name, classname=None )`` This is the panel used for basic Django field types. ``field_name`` is the name of the class property used in your model definition. ``classname`` is a string of optional CSS classes given to the panel which are used in formatting and scripted interactivity. By default, panels are formatted as inset fields. The CSS class ``full`` can be used to format the panel so it covers the full width of the Wagtail page editor. The CSS class ``title`` can be used to mark a field as the source for auto-generated slug strings. ``MultiFieldPanel( children, heading="", classname=None )`` This panel condenses several ``FieldPanel`` s or choosers, from a list or tuple, under a single ``heading`` string. - ``InlinePanel( base_model, relation_name, panels=None, label='', help_text='' )`` + ``InlinePanel( base_model, relation_name, panels=None, classname=None, label='', help_text='' )`` This panel allows for the creation of a "cluster" of related objects over a join to a separate model, such as a list of related links or slides to an image carousel. This is a very powerful, but tricky feature which will take some space to cover, so we'll skip over it for now. For a full explanation on the usage of ``InlinePanel``, see :ref:`inline_panels`. -Wagtail provides a tabbed interface to help organize panels. ``content_panels`` is the main tab, used for the meat of your model content. The other, ``promote_panels``, is suggested for organizing metadata about the content, such as SEO information and other machine-readable information. Since you're writing the panel definitions, you can organize them however you want. + ``FieldRowPanel( children, classname=None)`` + This panel is purely aesthetic. It creates a columnar layout in the editing interface, where each of the child Panels appears alongside each others rather than below. Use of FieldRowPanel particularly helps reduce the "snow-blindness" effect of seeing so many fields on the page, for complex models. It also improves the perceived association between fields of a similar nature. For example if you created a model representing an "Event" which had a starting date and ending date, it would be intuitive to find the start and end date on the same "row". + + FieldRowPanel should be used in combination with ``col*`` classnames added to each of the child Panels of the FieldRowPanel. The Wagtail editing interface is layed out using a grid system, in which the maximum width of the editor is 12 columns wide. Classes ``col1``-``col12`` can be applied to each child of a FieldRowPanel. The class ``col3`` will ensure that field appears 3 columns wide or a quarter the width. ``col4`` would cause the field to be 4 columns wide, or a third the width. + + **(In addition to these four, there are also Chooser Panels, detailed below.)** + + +Wagtail provides a tabbed interface to help organize panels. Three such tabs are provided: + +* ``content_panels`` is the main tab, used for the bulk of your model's fields. +* ``promote_panels`` is suggested for organizing fields regarding the promotion of the page around the site and the internet e.g A field to dictate whether the page should show in site-wide menus, descriptive text that should appear in site search results, SEO friendly titles, OpenGraph meta tag content and other machine-readable information. +* ``settings_panels`` is essentially for non-copy fields. By default it contains the page's scheduled publishing fields. Other suggested fields e.g: a field to switch between one layout/style and another. Let's look at an example of a panel definition: @@ -55,7 +67,10 @@ Let's look at an example of a panel definition: ExamplePage.content_panels = [ FieldPanel('title', classname="full title"), FieldPanel('body', classname="full"), - FieldPanel('date'), + FieldRowPanel([ + FieldPanel('start_date', classname="col3"), + FieldPanel('end_date', classname="col3"), + ]), ImageChooserPanel('splash_image'), DocumentChooserPanel('free_download'), PageChooserPanel('related_page'), @@ -254,6 +269,12 @@ Titles Use ``classname="title"`` to make Page's built-in title field stand out with more vertical padding. +Col* +------ + +Fields within a ``FieldRowPanel`` can have their width dictated in terms of the number of columns it should span. The ``FieldRowPanel`` is always considered to be 12 columns wide regardless of browser size or the nesting of ``FieldRowPanel`` in any other type of panel. Specify a number of columns thus: ``col3``, ``col4``, ``col6`` etc (up to 12). The resulting width with be *relative* to the full width of the ``FieldRowPanel``. + + Required Fields --------------- From ebd73184bf0f0d045e975628909940a8b8f7e023 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 14:04:31 +0100 Subject: [PATCH 072/298] Fixed migration conflict --- ...ublishing.py => 0004_fields_for_scheduled_publishing.py} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename wagtail/wagtailcore/migrations/{0003_fields_for_scheduled_publishing.py => 0004_fields_for_scheduled_publishing.py} (98%) diff --git a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py b/wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py similarity index 98% rename from wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py rename to wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py index 639068c2b..40602fa97 100644 --- a/wagtail/wagtailcore/migrations/0003_fields_for_scheduled_publishing.py +++ b/wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py @@ -91,8 +91,8 @@ class Migration(SchemaMigration): 'Meta': {'object_name': 'Page'}, 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), @@ -118,8 +118,8 @@ class Migration(SchemaMigration): 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) }, u'wagtailcore.site': { - 'Meta': {'object_name': 'Site'}, - 'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), + 'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'}, + 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), From eb1e8b0f873696019d0f0c77d86672a29fa811ac Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 1 Jul 2014 15:39:25 +0100 Subject: [PATCH 073/298] Fixed: 'use strict' caused undeclared variable to prevent preview --- wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js index 37f355e4e..4f76ce8a2 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js @@ -338,7 +338,7 @@ $(function() { /* Set up behaviour of preview button */ $('.action-preview').click(function(e) { e.preventDefault(); - $this = $(this); + var $this = $(this); var previewWindow = window.open($this.data('placeholder'), $this.data('windowname')); From 83161e324ff2cc5433730cd6d092690d57c863ba Mon Sep 17 00:00:00 2001 From: Tom Dyson Date: Tue, 1 Jul 2014 16:45:44 +0100 Subject: [PATCH 074/298] Updates to management commands docs With inclusion in index --- docs/index.rst | 1 + docs/management_commands.rst | 35 ++++++++++++++--------------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index a35560f82..5d2344b18 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -20,6 +20,7 @@ It supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support deploying performance static_site_generation + management_commands contributing support roadmap diff --git a/docs/management_commands.rst b/docs/management_commands.rst index e5f6393f7..3f77fc3ef 100644 --- a/docs/management_commands.rst +++ b/docs/management_commands.rst @@ -4,56 +4,49 @@ Management commands publish_scheduled_pages ----------------------- -**./manage.py publish_scheduled_pages** - -This command publishes/unpublishes pages that have had these actions scheduled by an editor. - -It is recommended to run this command once an hour. +:code:`./manage.py publish_scheduled_pages` +This command publishes or unpublishes pages that have had these actions scheduled by an editor. It is recommended to run this command once an hour. fixtree ------- -**./manage.py fixtree** +:code:`./manage.py fixtree` This command scans for errors in your database and attempts to fix any issues it finds. - move_pages ---------- -**./manage.py move_pages from to** +:code:`manage.py move_pages from to` -This mass moves a bunch of pages from one section of the tree to another. +This command moves a selection of pages from one section of the tree to another. Options: - **from** - This is id of the page to move pages from. All descendants of this page will be moved to the destination. After the operation is complete, this page will have no children. + This is the **id** of the page to move pages from. All descendants of this page will be moved to the destination. After the operation is complete, this page will have no children. - **to** - This is the id of the page to move pages to. - + This is the **id** of the page to move pages to. update_index ------------ -**./manage.py update_index** +:code:`./manage.py update_index` -This command rebuilds the search index from scratch. It is only required when using ElasticSearch. +This command rebuilds the search index from scratch. It is only required when using Elasticsearch. It is recommended to run this command once a week and at the following times: - - Whenever any pages have been created through a script (eg, import) - - Whenever any changes have been made to models or search configuration -While this command is running, the search may not return any results so avoid running this command at peak times. + - whenever any pages have been created through a script (after an import, for example) + - whenever any changes have been made to models or search configuration +The search may not return any results while this command is running, so avoid running it at peak times. search_garbage_collect ---------------------- -**./manage.py search_garbage_collect** +:code:`./manage.py search_garbage_collect` -Wagtail keeps a log of search queries that are popular on your website. On high traffic websites, this log may get big and sometimes you may want to clean out old search queries. - -This command cleans out all search query logs that are more than one week old. +Wagtail keeps a log of search queries that are popular on your website. On high traffic websites, this log may get big and you may want to clean out old search queries. This command cleans out all search query logs that are more than one week old. From 479dd1edde7061fd722fb8eb9a5da84c6875ca6b Mon Sep 17 00:00:00 2001 From: Tom Dyson Date: Tue, 1 Jul 2014 16:53:47 +0100 Subject: [PATCH 075/298] Minor editing API doc tweaks --- docs/editing_api.rst | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/docs/editing_api.rst b/docs/editing_api.rst index c32b54d35..609237e76 100644 --- a/docs/editing_api.rst +++ b/docs/editing_api.rst @@ -4,26 +4,24 @@ Defining models with the Editing API .. note:: This documentation is currently being written. - Wagtail provides a highly-customizable editing interface consisting of several components: - * **Fields** — built-in content types to augment the basic types provided by Django. + * **Fields** — built-in content types to augment the basic types provided by Django * **Panels** — the basic editing blocks for fields, groups of fields, and related object clusters * **Choosers** — interfaces for finding related objects in a ForeignKey relationship -Configuring your models to use these components will shape the Wagtail editor to your needs. Wagtail also provides an API for injecting custom CSS and Javascript for further customization, including extending the hallo.js rich text editor. +Configuring your models to use these components will shape the Wagtail editor to your needs. Wagtail also provides an API for injecting custom CSS and JavaScript for further customization, including extending the hallo.js rich text editor. There is also an Edit Handler API for creating your own Wagtail editor components. - Defining Panels ~~~~~~~~~~~~~~~ -A "panel" is the basic editing block in Wagtail. Wagtail will automatically pick the appropriate editing widget for most Django field types, you just need to add a panel for each field you want to show in the Wagtail page editor, in the order you want them to appear. +A "panel" is the basic editing block in Wagtail. Wagtail will automatically pick the appropriate editing widget for most Django field types; implementors just need to add a panel for each field they want to show in the Wagtail page editor, in the order they want them to appear. There are four basic types of panels: - + ``FieldPanel( field_name, classname=None )`` This is the panel used for basic Django field types. ``field_name`` is the name of the class property used in your model definition. ``classname`` is a string of optional CSS classes given to the panel which are used in formatting and scripted interactivity. By default, panels are formatted as inset fields. The CSS class ``full`` can be used to format the panel so it covers the full width of the Wagtail page editor. The CSS class ``title`` can be used to mark a field as the source for auto-generated slug strings. @@ -34,18 +32,17 @@ There are four basic types of panels: This panel allows for the creation of a "cluster" of related objects over a join to a separate model, such as a list of related links or slides to an image carousel. This is a very powerful, but tricky feature which will take some space to cover, so we'll skip over it for now. For a full explanation on the usage of ``InlinePanel``, see :ref:`inline_panels`. ``FieldRowPanel( children, classname=None)`` - This panel is purely aesthetic. It creates a columnar layout in the editing interface, where each of the child Panels appears alongside each others rather than below. Use of FieldRowPanel particularly helps reduce the "snow-blindness" effect of seeing so many fields on the page, for complex models. It also improves the perceived association between fields of a similar nature. For example if you created a model representing an "Event" which had a starting date and ending date, it would be intuitive to find the start and end date on the same "row". + This panel is purely aesthetic. It creates a columnar layout in the editing interface, where each of the child Panels appears alongside each other rather than below. Use of FieldRowPanel particularly helps reduce the "snow-blindness" effect of seeing so many fields on the page, for complex models. It also improves the perceived association between fields of a similar nature. For example if you created a model representing an "Event" which had a starting date and ending date, it may be intuitive to find the start and end date on the same "row". FieldRowPanel should be used in combination with ``col*`` classnames added to each of the child Panels of the FieldRowPanel. The Wagtail editing interface is layed out using a grid system, in which the maximum width of the editor is 12 columns wide. Classes ``col1``-``col12`` can be applied to each child of a FieldRowPanel. The class ``col3`` will ensure that field appears 3 columns wide or a quarter the width. ``col4`` would cause the field to be 4 columns wide, or a third the width. **(In addition to these four, there are also Chooser Panels, detailed below.)** - Wagtail provides a tabbed interface to help organize panels. Three such tabs are provided: -* ``content_panels`` is the main tab, used for the bulk of your model's fields. -* ``promote_panels`` is suggested for organizing fields regarding the promotion of the page around the site and the internet e.g A field to dictate whether the page should show in site-wide menus, descriptive text that should appear in site search results, SEO friendly titles, OpenGraph meta tag content and other machine-readable information. -* ``settings_panels`` is essentially for non-copy fields. By default it contains the page's scheduled publishing fields. Other suggested fields e.g: a field to switch between one layout/style and another. +* ``content_panels`` is the main tab, used for the bulk of your model's fields. +* ``promote_panels`` is suggested for organizing fields regarding the promotion of the page around the site and the Internet. For example, a field to dictate whether the page should show in site-wide menus, descriptive text that should appear in site search results, SEO-friendly titles, OpenGraph meta tag content and other machine-readable information. +* ``settings_panels`` is essentially for non-copy fields. By default it contains the page's scheduled publishing fields. Other suggested fields could include a field to switch between one layout/style and another. Let's look at an example of a panel definition: @@ -70,7 +67,7 @@ Let's look at an example of a panel definition: FieldRowPanel([ FieldPanel('start_date', classname="col3"), FieldPanel('end_date', classname="col3"), - ]), + ]), ImageChooserPanel('splash_image'), DocumentChooserPanel('free_download'), PageChooserPanel('related_page'), @@ -134,7 +131,7 @@ One of the features of Wagtail is a unified image library, which you can access on_delete=models.SET_NULL, related_name='+' ) - + BookPage.content_panels = [ ImageChooserPanel('cover'), # ... @@ -240,7 +237,7 @@ Snippets are vanilla Django models you create yourself without a Wagtail-provide on_delete=models.SET_NULL, related_name='+' ) - + BookPage.content_panels = [ SnippetChooserPanel('advert', Advert), # ... @@ -387,11 +384,9 @@ hallo.js plugin names are prefixed with the ``"IKS."`` namespace, but the ``name For information on developing custom hallo.js plugins, see the project's page: https://github.com/bergie/hallo - Edit Handler API ~~~~~~~~~~~~~~~~ - Admin Hooks ----------- @@ -505,7 +500,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func .. _construct_main_menu: ``construct_main_menu`` - Add, remove, or alter ``MenuItem`` objects from the Wagtail admin menu. The callable passed to this hook must take a ``request`` object and a list of ``menu_items``; it must return a list of menu items. New items can be constructed from the ``MenuItem`` class by passing in: a ``label`` which will be the text in the menu item, the URL of the admin page you want the menu item to link to (usually by calling ``reverse()`` on the admin view you've set up), CSS class ``name`` applied to the wrapping ``
            • `` of the menu item as ``"menu-{name}"``, CSS ``classnames`` which are used to give the link an icon, and an ``order`` integer which determine's the item's place in the menu. + Add, remove, or alter ``MenuItem`` objects from the Wagtail admin menu. The callable passed to this hook must take a ``request`` object and a list of ``menu_items``; it must return a list of menu items. New items can be constructed from the ``MenuItem`` class by passing in: a ``label`` which will be the text in the menu item, the URL of the admin page you want the menu item to link to (usually by calling ``reverse()`` on the admin view you've set up), CSS class ``name`` applied to the wrapping ``
            • `` of the menu item as ``"menu-{name}"``, CSS ``classnames`` which are used to give the link an icon, and an ``order`` integer which determine's the item's place in the menu. .. code-block:: python @@ -632,4 +627,3 @@ Custom Choosers Tests ----- - From bdf175ae41ebcd15180aa46ebf305c1dc4c8003d Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 2 Jul 2014 09:52:55 +0100 Subject: [PATCH 076/298] fixed: generated content font size bug in IE --- .../wagtailadmin/static/wagtailadmin/scss/components/forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 75f46b262..2fa0827b8 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -476,7 +476,7 @@ li.focused > .help{ &.field-small{ .input{ &:before, &:after{ - font-size:1.5em; + font-size:1.3rem; /* REMs are necessary here because IE doesn't treat generated content correctly */ top:0.3em; } &:before{ From 7e65a4d578aa39fd8b88e51a7da1c2a0f15f7f9f Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 2 Jul 2014 10:08:31 +0100 Subject: [PATCH 077/298] button metrics at mobile improved --- .../wagtailadmin/scss/components/forms.scss | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 2fa0827b8..aa8968f04 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -264,7 +264,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ left:0; top:0; width:2em; - line-height:2em; + line-height:1.85em; height:100%; text-align:center; background-color:rgba(0,0,0,0.2); @@ -278,7 +278,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ &:before{ width:2em; font-size:0.9rem; - line-height:2em; + line-height:1.65em; } } @@ -303,13 +303,6 @@ input[type=submit], input[type=reset], input[type=button], button{ } } -button.icon{ - &:before, - &:after{ - line-height:0; - } -} - .multiple{ @include transition(max-height 10s ease); padding:0; @@ -778,11 +771,12 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ } &.bicolor{ - padding-left:3.5em; + padding-left:3.7em; &:before{ - width:2.2em; - line-height:2.45em; + width:2em; + line-height:2.2em; + font-size:1.1rem; } } From 7ddcf0fbaceb32707f547d7580b25af0cc5d5f59 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 2 Jul 2014 10:17:21 +0100 Subject: [PATCH 078/298] Fixing #402, missing chooser button. Field inherited wrong template. --- .../wagtailsearch/editorspicks/includes/editorspicks_form.html | 2 +- .../templates/wagtailsearch/queries/chooser_field.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html index 01e891ccd..9a45dbef0 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html @@ -17,7 +17,7 @@ {% endif %}
            • - {% include "wagtailadmin/edit_handlers/field_panel_field.html" with field=form.description only %} + {% include "wagtailadmin/shared/field.html" with field=form.description only %}
            diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html index 317ba89d9..26ffa2959 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html @@ -1,4 +1,4 @@ -{% extends "wagtailadmin/edit_handlers/field_panel_field.html" %} +{% extends "wagtailadmin/shared/field.html" %} {% block form_field %}
            From f3a70c9f297cd5c48c6a4e91429f5999e578f3da Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 2 Jul 2014 10:21:28 +0100 Subject: [PATCH 079/298] correctly formatted query chooser modal content --- .../wagtailsearch/queries/chooser/chooser.html | 17 +++++++++-------- .../wagtailsearch/queries/chooser/results.html | 7 +++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html index b78f94b60..4859c8c1c 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html @@ -2,15 +2,16 @@ {% trans "Popular search terms" as pop_str %} {% include "wagtailadmin/shared/header.html" with title=pop_str %} - -
              - {% for field in searchform %} - {% include "wagtailadmin/shared/field_as_li.html" with field=field %} - {% endfor %} -
              • -
            -
            +
            +
              + {% for field in searchform %} + {% include "wagtailadmin/shared/field_as_li.html" with field=field %} + {% endfor %} +
              • +
            +
            +
            {% include "wagtailsearch/queries/chooser/results.html" %}
            diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html index 78de1e937..a9e25e641 100644 --- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html +++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html @@ -1,8 +1,7 @@ {% load i18n %} - - - + + @@ -20,7 +19,7 @@ {% endfor %} {% else %} - + {% endif %}
            {% trans "Terms" %}

            {% trans "No results found" %}

            {% trans "No results found" %}

            From 1cc258f404e81d3114897fdfee293f3ba8c04f20 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 14:35:10 +0100 Subject: [PATCH 080/298] Don't install unicodecsv on Python 3 and fallback to pythons built in csv library it it isn't installed. --- setup.py | 44 +++++++++++++++++++++++------------ wagtail/wagtailforms/views.py | 14 +++++++++-- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index 7b26817cd..d4c750a19 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,8 @@ #!/usr/bin/env python +import sys + + try: from setuptools import setup, find_packages except ImportError: @@ -16,6 +19,31 @@ except ImportError: pass +PY3 = sys.version_info[0] == 3 + + +install_requires = [ + "Django>=1.6.2,<1.7", + "South>=0.8.4", + "django-compressor>=1.3", + "django-libsass>=0.1", + "django-modelcluster>=0.1", + "django-taggit==0.11.2", + "django-treebeard==2.0", + "Pillow>=2.3.0", + "beautifulsoup4>=4.3.2", + "lxml>=3.3.0", + "Unidecode>=0.04.14", + "BeautifulSoup==3.2.1", # django-compressor gets confused if we have lxml but not BS3 installed +] + + +if not PY3: + install_requires += [ + "unicodecsv>=0.9.4" + ] + + setup( name='wagtail', version='0.3.1', @@ -40,20 +68,6 @@ setup( 'Framework :: Django', 'Topic :: Internet :: WWW/HTTP :: Site Management', ], - install_requires=[ - "Django>=1.6.2,<1.7", - "South>=0.8.4", - "django-compressor>=1.3", - "django-libsass>=0.1", - "django-modelcluster>=0.1", - "django-taggit==0.11.2", - "django-treebeard==2.0", - "Pillow>=2.3.0", - "beautifulsoup4>=4.3.2", - "lxml>=3.3.0", - 'unicodecsv>=0.9.4', - 'Unidecode>=0.04.14', - "BeautifulSoup==3.2.1", # django-compressor gets confused if we have lxml but not BS3 installed - ], + install_requires=install_requires, zip_safe=False, ) diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py index 2174642c6..f0dce9010 100644 --- a/wagtail/wagtailforms/views.py +++ b/wagtail/wagtailforms/views.py @@ -1,5 +1,11 @@ import datetime -import unicodecsv + +try: + import unicodecsv as csv + using_unicodecsv = True +except ImportError: + import csv + using_unicodecsv = False from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.core.exceptions import PermissionDenied @@ -65,7 +71,11 @@ def list_submissions(request, page_id): # return a CSV instead response = HttpResponse(content_type='text/csv; charset=utf-8') response['Content-Disposition'] = 'attachment;filename=export.csv' - writer = unicodecsv.writer(response, encoding='utf-8') + + if using_unicodecsv: + writer = csv.writer(response, encoding='utf-8') + else: + writer = csv.writer(response) header_row = ['Submission date'] + [label for name, label in data_fields] From 85a68a34f1812d11eb36cc9f3899206b61d21687 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 10:22:08 +0100 Subject: [PATCH 081/298] Requirements changes - Removed Beautiful Soup 3 - Added six --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d4c750a19..fe8673f28 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ install_requires = [ "beautifulsoup4>=4.3.2", "lxml>=3.3.0", "Unidecode>=0.04.14", - "BeautifulSoup==3.2.1", # django-compressor gets confused if we have lxml but not BS3 installed + "six==1.7.3", ] From cf15e903900ec169554dd2d5da527d5681b485c9 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 14:55:33 +0100 Subject: [PATCH 082/298] Fixed absolute import issues --- wagtail/wagtailimages/backends/__init__.py | 10 +++++++--- wagtail/wagtailimages/backends/base.py | 5 ----- wagtail/wagtailredirects/middleware.py | 2 +- wagtail/wagtailredirects/views.py | 2 +- wagtail/wagtailsearch/__init__.py | 6 +++--- wagtail/wagtailsearch/backends/__init__.py | 9 +++++++-- wagtail/wagtailsearch/backends/base.py | 5 ----- wagtail/wagtailsearch/forms.py | 3 ++- wagtail/wagtailsearch/views/__init__.py | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/wagtail/wagtailimages/backends/__init__.py b/wagtail/wagtailimages/backends/__init__.py index 62d0c1c78..e60b89688 100644 --- a/wagtail/wagtailimages/backends/__init__.py +++ b/wagtail/wagtailimages/backends/__init__.py @@ -8,11 +8,15 @@ except ImportError: # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7) from django.utils.importlib import import_module -from django.utils import six import sys -from django.conf import settings -from base import InvalidImageBackendError +from django.utils import six +from django.conf import settings +from django.core.exceptions import ImproperlyConfigured + + +class InvalidImageBackendError(ImproperlyConfigured): + pass # Pinched from django 1.7 source code. # TODO: Replace this with "from django.utils.module_loading import import_string" diff --git a/wagtail/wagtailimages/backends/base.py b/wagtail/wagtailimages/backends/base.py index ce07420e3..7024c358d 100644 --- a/wagtail/wagtailimages/backends/base.py +++ b/wagtail/wagtailimages/backends/base.py @@ -1,9 +1,4 @@ from django.conf import settings -from django.core.exceptions import ImproperlyConfigured - - -class InvalidImageBackendError(ImproperlyConfigured): - pass class BaseImageBackend(object): diff --git a/wagtail/wagtailredirects/middleware.py b/wagtail/wagtailredirects/middleware.py index 6fdd6fa27..e65d1be98 100644 --- a/wagtail/wagtailredirects/middleware.py +++ b/wagtail/wagtailredirects/middleware.py @@ -1,6 +1,6 @@ from django import http -import models +from wagtail.wagtailredirects import models # Originally pinched from: https://github.com/django/django/blob/master/django/contrib/redirects/middleware.py diff --git a/wagtail/wagtailredirects/views.py b/wagtail/wagtailredirects/views.py index 8dfd687f1..2a57ae57b 100644 --- a/wagtail/wagtailredirects/views.py +++ b/wagtail/wagtailredirects/views.py @@ -8,7 +8,7 @@ from django.views.decorators.vary import vary_on_headers from wagtail.wagtailadmin.edit_handlers import ObjectList from wagtail.wagtailadmin.forms import SearchForm -import models +from wagtail.wagtailredirects import models REDIRECT_EDIT_HANDLER = ObjectList(models.Redirect.content_panels) diff --git a/wagtail/wagtailsearch/__init__.py b/wagtail/wagtailsearch/__init__.py index 2b074bd9c..ed896f445 100644 --- a/wagtail/wagtailsearch/__init__.py +++ b/wagtail/wagtailsearch/__init__.py @@ -1,3 +1,3 @@ -from indexed import Indexed -from signal_handlers import register_signal_handlers -from backends import get_search_backend \ No newline at end of file +from wagtail.wagtailsearch.indexed import Indexed +from wagtail.wagtailsearch.signal_handlers import register_signal_handlers +from wagtail.wagtailsearch.backends import get_search_backend \ No newline at end of file diff --git a/wagtail/wagtailsearch/backends/__init__.py b/wagtail/wagtailsearch/backends/__init__.py index 5e1b4fc5d..cf33cf5c1 100644 --- a/wagtail/wagtailsearch/backends/__init__.py +++ b/wagtail/wagtailsearch/backends/__init__.py @@ -8,10 +8,15 @@ except ImportError: # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7) from django.utils.importlib import import_module -from django.utils import six import sys + +from django.utils import six from django.conf import settings -from base import InvalidSearchBackendError +from django.core.exceptions import ImproperlyConfigured + + +class InvalidSearchBackendError(ImproperlyConfigured): + pass # Pinched from django 1.7 source code. diff --git a/wagtail/wagtailsearch/backends/base.py b/wagtail/wagtailsearch/backends/base.py index 689be7bbe..393ecae1b 100644 --- a/wagtail/wagtailsearch/backends/base.py +++ b/wagtail/wagtailsearch/backends/base.py @@ -1,13 +1,8 @@ from django.db import models -from django.core.exceptions import ImproperlyConfigured from wagtail.wagtailsearch.indexed import Indexed -class InvalidSearchBackendError(ImproperlyConfigured): - pass - - class BaseSearch(object): def __init__(self, params): pass diff --git a/wagtail/wagtailsearch/forms.py b/wagtail/wagtailsearch/forms.py index 9485e4619..aaffad052 100644 --- a/wagtail/wagtailsearch/forms.py +++ b/wagtail/wagtailsearch/forms.py @@ -1,7 +1,8 @@ from django import forms from django.forms.models import inlineformset_factory from django.utils.translation import ugettext_lazy as _ -import models + +from wagtail.wagtailsearch import models class QueryForm(forms.Form): diff --git a/wagtail/wagtailsearch/views/__init__.py b/wagtail/wagtailsearch/views/__init__.py index 46e2526f6..7f39327bd 100644 --- a/wagtail/wagtailsearch/views/__init__.py +++ b/wagtail/wagtailsearch/views/__init__.py @@ -1 +1 @@ -from frontend import search \ No newline at end of file +from wagtail.wagtailsearch.views.frontend import search \ No newline at end of file From c90d61fa2acb4d58df1d0f29c1ae1120884fb93c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 14:50:21 +0100 Subject: [PATCH 083/298] Use six to import urllib and StringIO --- wagtail/wagtailadmin/templatetags/gravatar.py | 5 +++-- wagtail/wagtailcore/models.py | 5 +++-- .../tests/test_management_commands.py | 3 ++- wagtail/wagtailcore/tests/test_page_model.py | 2 +- .../tests/test_page_permissions.py | 2 +- .../wagtailcore/tests/test_page_queryset.py | 2 +- wagtail/wagtailcore/whitelist.py | 3 ++- wagtail/wagtailembeds/embeds.py | 16 ++++++++++------ wagtail/wagtailembeds/tests.py | 19 ++++++++++--------- wagtail/wagtailimages/models.py | 5 +++-- wagtail/wagtailimages/tests.py | 4 ++-- wagtail/wagtailredirects/models.py | 2 +- wagtail/wagtailsearch/tests/test_backends.py | 4 +++- wagtail/wagtailsearch/tests/test_queries.py | 2 +- 14 files changed, 43 insertions(+), 31 deletions(-) diff --git a/wagtail/wagtailadmin/templatetags/gravatar.py b/wagtail/wagtailadmin/templatetags/gravatar.py index 5c69f4fd2..15c161015 100644 --- a/wagtail/wagtailadmin/templatetags/gravatar.py +++ b/wagtail/wagtailadmin/templatetags/gravatar.py @@ -8,9 +8,10 @@ ### ### just make sure to update the "default" image path below -import urllib import hashlib +from six.moves.urllib.parse import urlencode + from django import template register = template.Library() @@ -31,7 +32,7 @@ class GravatarUrlNode(template.Node): size = int(self.size) * 2 # requested at retina size by default and scaled down at point of use with css gravatar_url = "//www.gravatar.com/avatar/" + hashlib.md5(email.lower()).hexdigest() + "?" - gravatar_url += urllib.urlencode({'s': str(size), 'd': default}) + gravatar_url += urlencode({'s': str(size), 'd': default}) return gravatar_url diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 95730e334..77691e1b9 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -1,7 +1,8 @@ -from StringIO import StringIO -from urlparse import urlparse import warnings +from six import StringIO +from six.moves.urllib.parse import urlparse + from modelcluster.models import ClusterableModel from django.db import models, connection, transaction diff --git a/wagtail/wagtailcore/tests/test_management_commands.py b/wagtail/wagtailcore/tests/test_management_commands.py index ae19167c2..1e3ff28e1 100644 --- a/wagtail/wagtailcore/tests/test_management_commands.py +++ b/wagtail/wagtailcore/tests/test_management_commands.py @@ -1,6 +1,7 @@ -from StringIO import StringIO from datetime import timedelta +from six import StringIO + from django.test import TestCase, Client from django.http import HttpRequest, Http404 from django.core import management diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 4cbdd9993..58c359d72 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -1,4 +1,4 @@ -from StringIO import StringIO +from six import StringIO from django.test import TestCase, Client from django.http import HttpRequest, Http404 diff --git a/wagtail/wagtailcore/tests/test_page_permissions.py b/wagtail/wagtailcore/tests/test_page_permissions.py index 111b059e6..eb2fe3257 100644 --- a/wagtail/wagtailcore/tests/test_page_permissions.py +++ b/wagtail/wagtailcore/tests/test_page_permissions.py @@ -1,4 +1,4 @@ -from StringIO import StringIO +from six import StringIO from django.test import TestCase, Client from django.http import HttpRequest, Http404 diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py index 57599173c..2c4e46c9c 100644 --- a/wagtail/wagtailcore/tests/test_page_queryset.py +++ b/wagtail/wagtailcore/tests/test_page_queryset.py @@ -1,4 +1,4 @@ -from StringIO import StringIO +from six import StringIO from django.test import TestCase, Client from django.http import HttpRequest, Http404 diff --git a/wagtail/wagtailcore/whitelist.py b/wagtail/wagtailcore/whitelist.py index 9a5f67cf1..d82a2b2cd 100644 --- a/wagtail/wagtailcore/whitelist.py +++ b/wagtail/wagtailcore/whitelist.py @@ -2,8 +2,9 @@ A generic HTML whitelisting engine, designed to accommodate subclassing to override specific rules. """ +from six.moves.urllib.parse import urlparse + from bs4 import BeautifulSoup, NavigableString, Tag -from urlparse import urlparse ALLOWED_URL_SCHEMES = ['', 'http', 'https', 'ftp', 'mailto', 'tel'] diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py index 2ec974d8a..ebc3e1491 100644 --- a/wagtail/wagtailembeds/embeds.py +++ b/wagtail/wagtailembeds/embeds.py @@ -1,4 +1,5 @@ import sys +from datetime import datetime try: from importlib import import_module @@ -6,13 +7,16 @@ except ImportError: # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7) from django.utils.importlib import import_module +from six.moves.urllib.request import urlopen, Request +from six.moves.urllib.error import URLError +from six.moves.urllib.parse import urlencode + from django.conf import settings -from datetime import datetime from django.utils import six + from wagtail.wagtailembeds.oembed_providers import get_oembed_provider from wagtail.wagtailembeds.models import Embed -import urllib2, urllib -import json + class EmbedNotFoundException(Exception): pass @@ -99,11 +103,11 @@ def oembed(url, max_width=None): params['maxwidth'] = max_width # Perform request - request = urllib2.Request(provider + '?' + urllib.urlencode(params)) + request = Request(provider + '?' + urlencode(params)) request.add_header('User-agent', 'Mozilla/5.0') try: - r = urllib2.urlopen(request) - except urllib2.URLError: + r = urlopen(request) + except URLError: raise EmbedNotFoundException oembed = json.loads(r.read()) diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py index 405566981..cc67e6b9b 100644 --- a/wagtail/wagtailembeds/tests.py +++ b/wagtail/wagtailembeds/tests.py @@ -1,5 +1,6 @@ +from six.moves.urllib.request import urlopen + from mock import patch -import urllib2 try: import embedly @@ -222,7 +223,7 @@ class TestOembed(TestCase): self.assertRaises(EmbedNotFoundException, wagtail_oembed, "http://www.youtube.com/watch/") - @patch('urllib2.urlopen') + @patch('six.moves.urllib.request.urlopen') @patch('json.loads') def test_oembed_photo_request(self, loads, urlopen) : urlopen.return_value = self.dummy_response @@ -233,7 +234,7 @@ class TestOembed(TestCase): self.assertEqual(result['html'], '') loads.assert_called_with("foo") - @patch('urllib2.urlopen') + @patch('six.moves.urllib.request.urlopen') @patch('json.loads') def test_oembed_return_values(self, loads, urlopen): urlopen.return_value = self.dummy_response @@ -268,7 +269,7 @@ class TestEmbedFilter(TestCase): return "foo" self.dummy_response = DummyResponse() - @patch('urllib2.urlopen') + @patch('six.moves.urllib.request.urlopen') @patch('json.loads') def test_valid_embed(self, loads, urlopen): urlopen.return_value = self.dummy_response @@ -277,7 +278,7 @@ class TestEmbedFilter(TestCase): result = embed_filter('http://www.youtube.com/watch/') self.assertEqual(result, '') - @patch('urllib2.urlopen') + @patch('six.moves.urllib.request.urlopenn') @patch('json.loads') def test_render_filter(self, loads, urlopen): urlopen.return_value = self.dummy_response @@ -288,7 +289,7 @@ class TestEmbedFilter(TestCase): result = temp.render(context) self.assertEqual(result, '') - @patch('urllib2.urlopen') + @patch('six.moves.urllib.request.urlopen') @patch('json.loads') def test_render_filter_nonexistent_type(self, loads, urlopen): urlopen.return_value = self.dummy_response @@ -307,7 +308,7 @@ class TestEmbedlyFilter(TestEmbedFilter): return "foo" self.dummy_response = DummyResponse() - @patch('urllib2.urlopen') + @patch('six.moves.urllib.request.urlopen') @patch('json.loads') def test_valid_embed(self, loads, urlopen): urlopen.return_value = self.dummy_response @@ -316,7 +317,7 @@ class TestEmbedlyFilter(TestEmbedFilter): result = embedly_filter('http://www.youtube.com/watch/') self.assertEqual(result, '') - @patch('urllib2.urlopen') + @patch('six.moves.urllib.request.urlopen') @patch('json.loads') def test_render_filter(self, loads, urlopen): urlopen.return_value = self.dummy_response @@ -327,7 +328,7 @@ class TestEmbedlyFilter(TestEmbedFilter): result = temp.render(context) self.assertEqual(result, '') - @patch('urllib2.urlopen') + @patch('six.moves.urllib.request.urlopen') @patch('json.loads') def test_render_filter_nonexistent_type(self, loads, urlopen): urlopen.return_value = self.dummy_response diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index 3ff2f9782..fe898b4d6 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -1,7 +1,8 @@ -import StringIO import os.path import re +from six import BytesIO + from taggit.managers import TaggableManager from django.core.files import File @@ -208,7 +209,7 @@ class Filter(models.Model): image = method(image, self.method_arg) - output = StringIO.StringIO() + output = BytesIO() backend.save_image(image, output, file_format) # and then close the input file diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py index 5b7b2fd14..af4f305e7 100644 --- a/wagtail/wagtailimages/tests.py +++ b/wagtail/wagtailimages/tests.py @@ -18,11 +18,11 @@ from wagtail.wagtailimages.backends import get_image_backend from wagtail.wagtailimages.backends.pillow import PillowBackend def get_test_image_file(): - from StringIO import StringIO + from six import BytesIO from PIL import Image from django.core.files.images import ImageFile - f = StringIO() + f = BytesIO() image = Image.new('RGB', (640, 480), 'white') image.save(f, 'PNG') return ImageFile(f, name='test.png') diff --git a/wagtail/wagtailredirects/models.py b/wagtail/wagtailredirects/models.py index 6440ad383..d04b4911e 100644 --- a/wagtail/wagtailredirects/models.py +++ b/wagtail/wagtailredirects/models.py @@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, PageChooserPanel -from urlparse import urlparse +from six.moves.urllib.parse import urlparse class Redirect(models.Model): diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index fa7b4d9fa..e8a175f21 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -1,12 +1,14 @@ +from six import StringIO + from django.test import TestCase from django.test.utils import override_settings from django.conf import settings from django.core import management + from wagtail.tests.utils import unittest from wagtail.wagtailsearch import models, get_search_backend from wagtail.wagtailsearch.backends.db import DBSearch from wagtail.wagtailsearch.backends import InvalidSearchBackendError -from StringIO import StringIO # Register wagtailsearch signal handlers diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py index fb47478a2..10785187e 100644 --- a/wagtail/wagtailsearch/tests/test_queries.py +++ b/wagtail/wagtailsearch/tests/test_queries.py @@ -1,4 +1,4 @@ -from StringIO import StringIO +from six import StringIO from django.test import TestCase from django.core import management From 600de852d8b47a90f18611edc5767a40cdb4362e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 27 Mar 2014 15:00:17 +0000 Subject: [PATCH 084/298] Use six.with_metaclass to add metaclass to Page --- wagtail/wagtailcore/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 77691e1b9..aeb41d732 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -1,5 +1,6 @@ import warnings +import six from six import StringIO from six.moves.urllib.parse import urlparse @@ -256,9 +257,7 @@ class PageBase(models.base.ModelBase): PAGE_MODEL_CLASSES.append(cls) -class Page(MP_Node, ClusterableModel, Indexed): - __metaclass__ = PageBase - +class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): title = models.CharField(max_length=255, help_text=_("The page title as you'd like it to be seen by the public")) slug = models.SlugField(help_text=_("The name of the page as it will appear in URLs e.g http://domain.com/blog/[my-slug]/")) # TODO: enforce uniqueness on slug field per parent (will have to be done at the Django From 688a9f1c6875160d9d3ff459ee69ba3b9768b8fb Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 15:40:00 +0100 Subject: [PATCH 085/298] Replaced occurances of 'unicode' with 'six.text_type' --- wagtail/wagtailadmin/edit_handlers.py | 4 +++- wagtail/wagtailadmin/menu.py | 4 +++- wagtail/wagtailcore/whitelist.py | 2 +- wagtail/wagtailsnippets/views/chooser.py | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index ab776061b..d7b4b5528 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -2,6 +2,8 @@ import copy import re import datetime +from six import text_type + from taggit.forms import TagWidget from modelcluster.forms import ClusterForm, ClusterFormMetaclass @@ -245,7 +247,7 @@ class EditHandler(object): """ rendered_fields = self.rendered_fields() missing_fields_html = [ - unicode(self.form[field_name]) + text_type(self.form[field_name]) for field_name in self.form.fields if field_name not in rendered_fields ] diff --git a/wagtail/wagtailadmin/menu.py b/wagtail/wagtailadmin/menu.py index b99e3b0ee..dcc241baa 100644 --- a/wagtail/wagtailadmin/menu.py +++ b/wagtail/wagtailadmin/menu.py @@ -1,3 +1,5 @@ +from six import text_type + from django.utils.text import slugify from django.utils.html import format_html @@ -7,7 +9,7 @@ class MenuItem(object): self.label = label self.url = url self.classnames = classnames - self.name = (name or slugify(unicode(label))) + self.name = (name or slugify(text_type(label))) self.order = order def render_html(self): diff --git a/wagtail/wagtailcore/whitelist.py b/wagtail/wagtailcore/whitelist.py index d82a2b2cd..0859ccfa8 100644 --- a/wagtail/wagtailcore/whitelist.py +++ b/wagtail/wagtailcore/whitelist.py @@ -83,7 +83,7 @@ class Whitelister(object): attributes""" doc = BeautifulSoup(html, 'lxml') cls.clean_node(doc, doc) - return unicode(doc) + return doc.decode() @classmethod def clean_node(cls, doc, node): diff --git a/wagtail/wagtailsnippets/views/chooser.py b/wagtail/wagtailsnippets/views/chooser.py index f7905e025..478c66a60 100644 --- a/wagtail/wagtailsnippets/views/chooser.py +++ b/wagtail/wagtailsnippets/views/chooser.py @@ -1,5 +1,7 @@ import json +from six import text_type + from django.shortcuts import get_object_or_404 from django.contrib.auth.decorators import permission_required @@ -35,7 +37,7 @@ def chosen(request, content_type_app_name, content_type_model_name, id): snippet_json = json.dumps({ 'id': item.id, - 'string': unicode(item), + 'string': text_type(item), }) return render_modal_workflow( From 409e6e781b38f990a69a47b8850af03a2e14caca Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 15:53:53 +0100 Subject: [PATCH 086/298] Replaced occurances of 'basestring' with 'six.string_types' --- wagtail/wagtailadmin/edit_handlers.py | 3 ++- wagtail/wagtailcore/models.py | 3 ++- wagtail/wagtailsearch/indexed.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index d7b4b5528..638072fa8 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -2,6 +2,7 @@ import copy import re import datetime +from six import string_types from six import text_type from taggit.forms import TagWidget @@ -485,7 +486,7 @@ class BasePageChooserPanel(BaseChooserPanel): def target_content_type(cls): if cls._target_content_type is None: if cls.page_type: - if isinstance(cls.page_type, basestring): + if isinstance(cls.page_type, string_types): # translate the passed model name into an actual model class from django.db.models import get_model try: diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index aeb41d732..a73c898e5 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -1,6 +1,7 @@ import warnings import six +from six import string_types from six import StringIO from six.moves.urllib.parse import urlparse @@ -536,7 +537,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): else: res = [] for page_type in cls.subpage_types: - if isinstance(page_type, basestring): + if isinstance(page_type, string_types): try: app_label, model_name = page_type.split(".") except ValueError: diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index aa750d7b9..dfed7799a 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -1,3 +1,5 @@ +from six import string_types + from django.db import models @@ -37,7 +39,7 @@ class Indexed(object): indexed_fields = cls.indexed_fields if isinstance(indexed_fields, tuple): indexed_fields = list(indexed_fields) - if isinstance(indexed_fields, basestring): + if isinstance(indexed_fields, string_types): indexed_fields = [indexed_fields] if isinstance(indexed_fields, list): indexed_fields = dict((field, dict(type="string")) for field in indexed_fields) From 0272411222a93b022f7975e04a02731fe70f6a3a Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 15:57:19 +0100 Subject: [PATCH 087/298] Replaced occurances of 'dict.iteritems' with 'dict.items' --- wagtail/wagtailadmin/views/pages.py | 2 +- wagtail/wagtailsearch/tests/test_backends.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index fd0ed85b2..29585717f 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -343,7 +343,7 @@ def edit(request, page_id): edit_handler = edit_handler_class(instance=page, form=form) errors_debug = ( repr(edit_handler.form.errors) - + repr([(name, formset.errors) for (name, formset) in edit_handler.form.formsets.iteritems() if formset.errors]) + + repr([(name, formset.errors) for (name, formset) in edit_handler.form.formsets.items() if formset.errors]) ) else: form = form_class(instance=page) diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index e8a175f21..8fab1d152 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -21,7 +21,7 @@ class BackendTests(object): def setUp(self): # Search WAGTAILSEARCH_BACKENDS for an entry that uses the given backend path - for (backend_name, backend_conf) in settings.WAGTAILSEARCH_BACKENDS.iteritems(): + for backend_name, backend_conf in settings.WAGTAILSEARCH_BACKENDS.items(): if backend_conf['BACKEND'] == self.backend_path: self.backend = get_search_backend(backend_name) break From b56c18cb19005c1e42006f440b92514e50326626 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 16:44:19 +0100 Subject: [PATCH 088/298] Replaced occurance of 'xrange' with 'range' --- wagtail/wagtailsearch/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailsearch/forms.py b/wagtail/wagtailsearch/forms.py index aaffad052..75d672d67 100644 --- a/wagtail/wagtailsearch/forms.py +++ b/wagtail/wagtailsearch/forms.py @@ -49,7 +49,7 @@ class EditorsPickFormSet(EditorsPickFormSetBase): # Check there is at least one non-deleted form. non_deleted_forms = self.total_form_count() non_empty_forms = 0 - for i in xrange(0, self.total_form_count()): + for i in range(0, self.total_form_count()): form = self.forms[i] if self.can_delete and self._should_delete_form(form): non_deleted_forms -= 1 From 5cd1d8276917e0305f8a9a4d6b17ac803ed0b784 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 15:43:35 +0100 Subject: [PATCH 089/298] Cast email address to bytes before hashing into gravatar url --- wagtail/wagtailadmin/templatetags/gravatar.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/templatetags/gravatar.py b/wagtail/wagtailadmin/templatetags/gravatar.py index 15c161015..c831e6cb5 100644 --- a/wagtail/wagtailadmin/templatetags/gravatar.py +++ b/wagtail/wagtailadmin/templatetags/gravatar.py @@ -10,6 +10,7 @@ import hashlib +from six import b from six.moves.urllib.parse import urlencode from django import template @@ -31,7 +32,7 @@ class GravatarUrlNode(template.Node): default = "blank" size = int(self.size) * 2 # requested at retina size by default and scaled down at point of use with css - gravatar_url = "//www.gravatar.com/avatar/" + hashlib.md5(email.lower()).hexdigest() + "?" + gravatar_url = "//www.gravatar.com/avatar/" + hashlib.md5(b(email.lower())).hexdigest() + "?" gravatar_url += urlencode({'s': str(size), 'd': default}) return gravatar_url From 99f7b5656063400f917cf917c94dfb3327519d3f Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 15:50:04 +0100 Subject: [PATCH 090/298] Replaced __unicode__ methods with __str__ methods --- wagtail/tests/models.py | 12 +++++++++--- wagtail/wagtailcore/models.py | 10 +++++++--- wagtail/wagtaildocs/models.py | 4 +++- wagtail/wagtailembeds/models.py | 4 +++- wagtail/wagtailforms/models.py | 4 +++- wagtail/wagtailimages/models.py | 4 +++- wagtail/wagtailsearch/models.py | 4 +++- wagtail/wagtailusers/models.py | 4 +++- 8 files changed, 34 insertions(+), 12 deletions(-) diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py index ca6d411da..ff6dc2dcc 100644 --- a/wagtail/tests/models.py +++ b/wagtail/tests/models.py @@ -1,6 +1,9 @@ from django.db import models from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.utils.encoding import python_2_unicode_compatible + from modelcluster.fields import ParentalKey + from wagtail.wagtailcore.models import Page, Orderable from wagtail.wagtailcore.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, InlinePanel, PageChooserPanel @@ -259,6 +262,7 @@ FormPage.content_panels = [ # Snippets +@python_2_unicode_compatible class Advert(models.Model): url = models.URLField(null=True, blank=True) text = models.CharField(max_length=255) @@ -268,7 +272,7 @@ class Advert(models.Model): FieldPanel('text'), ] - def __unicode__(self): + def __str__(self): return self.text @@ -281,18 +285,20 @@ register_snippet(Advert) # to ensure specific [in]correct register ordering # AlphaSnippet is registered during TestSnippetOrdering +@python_2_unicode_compatible class AlphaSnippet(models.Model): text = models.CharField(max_length=255) - def __unicode__(self): + def __str__(self): return self.text # ZuluSnippet is registered during TestSnippetOrdering +@python_2_unicode_compatible class ZuluSnippet(models.Model): text = models.CharField(max_length=255) - def __unicode__(self): + def __str__(self): return self.text diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index a73c898e5..e3a8e91eb 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -22,6 +22,7 @@ from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import ValidationError from django.utils.functional import cached_property +from django.utils.encoding import python_2_unicode_compatible from treebeard.mp_tree import MP_Node @@ -36,6 +37,7 @@ class SiteManager(models.Manager): return self.get(hostname=hostname, port=port) +@python_2_unicode_compatible class Site(models.Model): hostname = models.CharField(max_length=255, db_index=True) port = models.IntegerField(default=80, help_text=_("Set this to something other than 80 if you need a specific port number to appear in URLs (e.g. development on port 8000). Does not affect request handling (so port forwarding still works).")) @@ -48,7 +50,7 @@ class Site(models.Model): def natural_key(self): return (self.hostname, self.port) - def __unicode__(self): + def __str__(self): return self.hostname + ("" if self.port == 80 else (":%d" % self.port)) + (" [default]" if self.is_default_site else "") @staticmethod @@ -258,6 +260,7 @@ class PageBase(models.base.ModelBase): PAGE_MODEL_CLASSES.append(cls) +@python_2_unicode_compatible class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): title = models.CharField(max_length=255, help_text=_("The page title as you'd like it to be seen by the public")) slug = models.SlugField(help_text=_("The name of the page as it will appear in URLs e.g http://domain.com/blog/[my-slug]/")) @@ -301,7 +304,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): # created as self.content_type = ContentType.objects.get_for_model(self) - def __unicode__(self): + def __str__(self): return self.title is_abstract = True # don't offer Page in the list of page types a superuser can create @@ -771,6 +774,7 @@ class SubmittedRevisionsManager(models.Manager): return super(SubmittedRevisionsManager, self).get_queryset().filter(submitted_for_moderation=True) +@python_2_unicode_compatible class PageRevision(models.Model): page = models.ForeignKey('Page', related_name='revisions') submitted_for_moderation = models.BooleanField(default=False) @@ -828,7 +832,7 @@ class PageRevision(models.Model): self.submitted_for_moderation = False page.revisions.update(submitted_for_moderation=False) - def __unicode__(self): + def __str__(self): return '"' + unicode(self.page) + '" at ' + unicode(self.created_at) diff --git a/wagtail/wagtaildocs/models.py b/wagtail/wagtaildocs/models.py index 2149320f7..a87b9c02b 100644 --- a/wagtail/wagtaildocs/models.py +++ b/wagtail/wagtaildocs/models.py @@ -9,10 +9,12 @@ from django.dispatch import Signal from django.core.urlresolvers import reverse from django.conf import settings from django.utils.translation import ugettext_lazy as _ +from django.utils.encoding import python_2_unicode_compatible from wagtail.wagtailadmin.taggable import TagSearchable +@python_2_unicode_compatible class Document(models.Model, TagSearchable): title = models.CharField(max_length=255, verbose_name=_('Title')) file = models.FileField(upload_to='documents' , verbose_name=_('File')) @@ -30,7 +32,7 @@ class Document(models.Model, TagSearchable): }, } - def __unicode__(self): + def __str__(self): return self.title @property diff --git a/wagtail/wagtailembeds/models.py b/wagtail/wagtailembeds/models.py index c147860f0..4f61c19d7 100644 --- a/wagtail/wagtailembeds/models.py +++ b/wagtail/wagtailembeds/models.py @@ -1,4 +1,5 @@ from django.db import models +from django.utils.encoding import python_2_unicode_compatible EMBED_TYPES = ( @@ -9,6 +10,7 @@ EMBED_TYPES = ( ) +@python_2_unicode_compatible class Embed(models.Model): url = models.URLField() max_width = models.SmallIntegerField(null=True, blank=True) @@ -25,5 +27,5 @@ class Embed(models.Model): class Meta: unique_together = ('url', 'max_width') - def __unicode__(self): + def __str__(self): return self.url diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index 75f0eceee..c74ace88b 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -2,6 +2,7 @@ from django.db import models from django.shortcuts import render from django.utils.translation import ugettext_lazy as _ from django.utils.text import slugify +from django.utils.encoding import python_2_unicode_compatible from unidecode import unidecode import json @@ -32,6 +33,7 @@ FORM_FIELD_CHOICES = ( HTML_EXTENSION_RE = re.compile(r"(.*)\.html") +@python_2_unicode_compatible class FormSubmission(models.Model): """Data for a Form submission.""" @@ -43,7 +45,7 @@ class FormSubmission(models.Model): def get_data(self): return json.loads(self.form_data) - def __unicode__(self): + def __str__(self): return self.form_data diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index fe898b4d6..db73b048a 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -14,6 +14,7 @@ from django.utils.safestring import mark_safe from django.utils.html import escape, format_html_join from django.conf import settings from django.utils.translation import ugettext_lazy as _ +from django.utils.encoding import python_2_unicode_compatible from unidecode import unidecode @@ -22,6 +23,7 @@ from wagtail.wagtailimages.backends import get_image_backend from .utils import validate_image_format +@python_2_unicode_compatible class AbstractImage(models.Model, TagSearchable): title = models.CharField(max_length=255, verbose_name=_('Title') ) @@ -55,7 +57,7 @@ class AbstractImage(models.Model, TagSearchable): }, } - def __unicode__(self): + def __str__(self): return self.title def get_rendition(self, filter): diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py index c8c2f2fa4..abb479295 100644 --- a/wagtail/wagtailsearch/models.py +++ b/wagtail/wagtailsearch/models.py @@ -2,11 +2,13 @@ import datetime from django.db import models from django.utils import timezone +from django.utils.encoding import python_2_unicode_compatible from wagtail.wagtailsearch.indexed import Indexed from wagtail.wagtailsearch.utils import normalise_query_string, MAX_QUERY_STRING_LENGTH +@python_2_unicode_compatible class Query(models.Model): query_string = models.CharField(max_length=MAX_QUERY_STRING_LENGTH, unique=True) @@ -23,7 +25,7 @@ class Query(models.Model): daily_hits.hits = models.F('hits') + 1 daily_hits.save() - def __unicode__(self): + def __str__(self): return self.query_string @property diff --git a/wagtail/wagtailusers/models.py b/wagtail/wagtailusers/models.py index 4e8bfc63d..eb0aa0c9e 100644 --- a/wagtail/wagtailusers/models.py +++ b/wagtail/wagtailusers/models.py @@ -1,8 +1,10 @@ from django.db import models from django.conf import settings from django.utils.translation import ugettext_lazy as _ +from django.utils.encoding import python_2_unicode_compatible +@python_2_unicode_compatible class UserProfile(models.Model): user = models.OneToOneField(settings.AUTH_USER_MODEL) @@ -25,5 +27,5 @@ class UserProfile(models.Model): def get_for_user(cls, user): return cls.objects.get_or_create(user=user)[0] - def __unicode__(self): + def __str__(self): return self.user.username From 6bd8e056b818fa0ee8a4f5c43fe3bdc0f9e5e9df Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 15:51:44 +0100 Subject: [PATCH 091/298] Another unicode replaced with text_type --- wagtail/wagtailforms/models.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index c74ace88b..41414d391 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -1,13 +1,16 @@ +import json +import re + +from six import text_type + +from unidecode import unidecode + from django.db import models from django.shortcuts import render from django.utils.translation import ugettext_lazy as _ from django.utils.text import slugify from django.utils.encoding import python_2_unicode_compatible -from unidecode import unidecode -import json -import re - from wagtail.wagtailcore.models import Page, Orderable, UserPagePermissionsProxy, get_page_types from wagtail.wagtailadmin.edit_handlers import FieldPanel from wagtail.wagtailadmin import tasks @@ -75,7 +78,7 @@ class AbstractFormField(Orderable): # unidecode will return an ascii string while slugify wants a # unicode string on the other hand, slugify returns a safe-string # which will be converted to a normal str - return str(slugify(unicode(unidecode(self.label)))) + return str(slugify(text_type(unidecode(self.label)))) panels = [ FieldPanel('label'), From 623e77391d5140020841f0eb3194854bf578867c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 16:05:10 +0100 Subject: [PATCH 092/298] Use python 3 print function --- .../commands/publish_scheduled_pages.py | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py index b80ace728..cb0d4cab8 100644 --- a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py +++ b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import datetime import json from optparse import make_option @@ -31,7 +33,7 @@ class Command(BaseCommand): def handle(self, *args, **options): dryrun = False if options['dryrun']: - print "Will do a dry run." + print("Will do a dry run.") dryrun = True # 1. get all expired pages with live = True @@ -41,17 +43,17 @@ class Command(BaseCommand): ) if dryrun: if expired_pages: - print "Expired pages to be deactivated:" - print "Expiry datetime\t\tSlug\t\tName" - print "---------------\t\t----\t\t----" + print("Expired pages to be deactivated:") + print("Expiry datetime\t\tSlug\t\tName") + print("---------------\t\t----\t\t----") for ep in expired_pages: - print "{0}\t{1}\t{2}".format( + print("{0}\t{1}\t{2}".format( ep.expire_at.strftime("%Y-%m-%d %H:%M"), ep.slug, ep.title - ) + )) else: - print "No expired pages to be deactivated found." + print("No expired pages to be deactivated found.") else: expired_pages.update(expired=True, live=False) @@ -62,22 +64,22 @@ class Command(BaseCommand): ) if revision_date_expired(r) ] if dryrun: - print "---------------------------------" + print("---------------------------------") if expired_revs: - print "Expired revisions to be dropped from moderation queue:" - print "Expiry datetime\t\tSlug\t\tName" - print "---------------\t\t----\t\t----" + print("Expired revisions to be dropped from moderation queue:") + print("Expiry datetime\t\tSlug\t\tName") + print("---------------\t\t----\t\t----") for er in expired_revs: rev_data = json.loads(er.content_json) - print "{0}\t{1}\t{2}".format( + print("{0}\t{1}\t{2}".format( dateparse.parse_datetime( rev_data.get('expire_at') ).strftime("%Y-%m-%d %H:%M"), rev_data.get('slug'), rev_data.get('title') - ) + )) else: - print "No expired revision to be dropped from moderation." + print("No expired revision to be dropped from moderation.") else: for er in expired_revs: er.submitted_for_moderation = False @@ -88,20 +90,20 @@ class Command(BaseCommand): approved_go_live_at__lt=timezone.now() ) if dryrun: - print "---------------------------------" + print("---------------------------------") if revs_for_publishing: - print "Revisions to be published:" - print "Go live datetime\t\tSlug\t\tName" - print "---------------\t\t\t----\t\t----" + print("Revisions to be published:") + print("Go live datetime\t\tSlug\t\tName") + print("---------------\t\t\t----\t\t----") for rp in revs_for_publishing: rev_data = json.loads(rp.content_json) - print "{0}\t\t{1}\t{2}".format( + print("{0}\t\t{1}\t{2}".format( rp.approved_go_live_at.strftime("%Y-%m-%d %H:%M"), rev_data.get('slug'), rev_data.get('title') - ) + )) else: - print "No pages to go live." + print("No pages to go live.") else: for rp in revs_for_publishing: # just run publish for the revision -- since the approved go From b4cf0ab15a6784d45fd44bfff7a223a92bbce515 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 16:05:57 +0100 Subject: [PATCH 093/298] Fixed python 3 incompatible method for concatenating dictionaries --- wagtail/wagtailcore/rich_text.py | 4 ++-- wagtail/wagtailsearch/backends/elasticsearch.py | 5 +++-- wagtail/wagtailsearch/indexed.py | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailcore/rich_text.py b/wagtail/wagtailcore/rich_text.py index 8004cb30d..c5229f747 100644 --- a/wagtail/wagtailcore/rich_text.py +++ b/wagtail/wagtailcore/rich_text.py @@ -166,8 +166,8 @@ class DbWhitelister(Whitelister): def clean(cls, html): if not cls.has_loaded_custom_whitelist_rules: for fn in hooks.get_hooks('construct_whitelister_element_rules'): - cls.element_rules = dict( - cls.element_rules.items() + fn().items()) + cls.element_rules = cls.element_rules.copy() + cls.element_rules.update(fn()) cls.has_loaded_custom_whitelist_rules = True return super(DbWhitelister, cls).clean(html) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 4c7c79da9..e4d716ea1 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -338,10 +338,11 @@ class ElasticSearch(BaseSearch): indexed_fields = model.indexed_get_indexed_fields() # Make field list - fields = dict({ + fields = { "pk": dict(type="string", index="not_analyzed", store="yes"), "content_type": dict(type="string"), - }.items() + indexed_fields.items()) + } + fields.update(indexed_fields) # Put mapping self.es.indices.put_mapping(index=self.es_index, doc_type=content_type, body={ diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index dfed7799a..60c56c8b4 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -51,7 +51,8 @@ class Indexed(object): if parent: # Add parent fields into this list parent_indexed_fields = parent.indexed_get_indexed_fields() - indexed_fields = dict(parent_indexed_fields.items() + indexed_fields.items()) + parent_indexed_fields.update(indexed_fields) + indexed_fields = parent_indexed_fields return indexed_fields def indexed_get_document_id(self): From e58929d79b42e6fceb7c00035918a743a09cc832 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 16:29:58 +0100 Subject: [PATCH 094/298] Cast test docs to bytes before uploading --- wagtail/wagtaildocs/tests.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/wagtail/wagtaildocs/tests.py b/wagtail/wagtaildocs/tests.py index a8420406b..79b799a36 100644 --- a/wagtail/wagtaildocs/tests.py +++ b/wagtail/wagtaildocs/tests.py @@ -1,10 +1,14 @@ +from six import b + from django.test import TestCase -from wagtail.wagtaildocs import models -from wagtail.tests.utils import WagtailTestUtils + from django.contrib.auth.models import User, Group, Permission from django.core.urlresolvers import reverse from django.core.files.base import ContentFile +from wagtail.wagtaildocs import models +from wagtail.tests.utils import WagtailTestUtils + # TODO: Test serve view @@ -112,7 +116,7 @@ class TestDocumentAddView(TestCase, WagtailTestUtils): def test_post(self): # Build a fake file - fake_file = ContentFile("A boring example document") + fake_file = ContentFile(b("A boring example document")) fake_file.name = 'test.txt' # Submit @@ -134,7 +138,7 @@ class TestDocumentEditView(TestCase, WagtailTestUtils): self.login() # Build a fake file - fake_file = ContentFile("A boring example document") + fake_file = ContentFile(b("A boring example document")) fake_file.name = 'test.txt' # Create a document to edit @@ -147,7 +151,7 @@ class TestDocumentEditView(TestCase, WagtailTestUtils): def test_post(self): # Build a fake file - fake_file = ContentFile("A boring example document") + fake_file = ContentFile(b("A boring example document")) fake_file.name = 'test.txt' # Submit title change @@ -272,7 +276,7 @@ class TestDocumentChooserUploadView(TestCase, WagtailTestUtils): def test_post(self): # Build a fake file - fake_file = ContentFile("A boring example document") + fake_file = ContentFile(b("A boring example document")) fake_file.name = 'test.txt' # Submit From a4bd768a7db03fe768e848ec13fa8e8eca930600 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 16:11:08 +0100 Subject: [PATCH 095/298] Make sure that we are not iterating over tag.attrs.items() --- wagtail/wagtailcore/whitelist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailcore/whitelist.py b/wagtail/wagtailcore/whitelist.py index 0859ccfa8..4aaff780d 100644 --- a/wagtail/wagtailcore/whitelist.py +++ b/wagtail/wagtailcore/whitelist.py @@ -29,7 +29,7 @@ def attribute_rule(allowed_attrs): * if the lookup returns a truthy value, keep the attribute; if falsy, drop it """ def fn(tag): - for attr, val in tag.attrs.items(): + for attr, val in list(tag.attrs.items()): rule = allowed_attrs.get(attr) if rule: if callable(rule): From dbcb17c70670671c0e457cc6e767b2899920fd0a Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 17:22:23 +0100 Subject: [PATCH 096/298] Fixed wagtailembeds tests --- wagtail/wagtailembeds/embeds.py | 9 +++++++-- wagtail/wagtailembeds/tests.py | 8 +++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py index ebc3e1491..40bf48ec9 100644 --- a/wagtail/wagtailembeds/embeds.py +++ b/wagtail/wagtailembeds/embeds.py @@ -1,5 +1,6 @@ import sys from datetime import datetime +import json try: from importlib import import_module @@ -7,7 +8,11 @@ except ImportError: # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7) from django.utils.importlib import import_module -from six.moves.urllib.request import urlopen, Request + +# Needs to be imported like this to allow @patch to work in tests +from six.moves.urllib import request as urllib_request + +from six.moves.urllib.request import Request from six.moves.urllib.error import URLError from six.moves.urllib.parse import urlencode @@ -106,7 +111,7 @@ def oembed(url, max_width=None): request = Request(provider + '?' + urlencode(params)) request.add_header('User-agent', 'Mozilla/5.0') try: - r = urlopen(request) + r = urllib_request.urlopen(request) except URLError: raise EmbedNotFoundException oembed = json.loads(r.read()) diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py index cc67e6b9b..2c68ef744 100644 --- a/wagtail/wagtailembeds/tests.py +++ b/wagtail/wagtailembeds/tests.py @@ -1,4 +1,6 @@ from six.moves.urllib.request import urlopen +import six.moves.urllib.request +from six.moves.urllib.error import URLError from mock import patch @@ -218,8 +220,8 @@ class TestOembed(TestCase): self.assertRaises(EmbedNotFoundException, wagtail_oembed, "foo") def test_oembed_invalid_request(self): - config = {'side_effect': urllib2.URLError('foo')} - with patch.object(urllib2, 'urlopen', **config) as urlopen: + config = {'side_effect': URLError('foo')} + with patch.object(six.moves.urllib.request, 'urlopen', **config) as urlopen: self.assertRaises(EmbedNotFoundException, wagtail_oembed, "http://www.youtube.com/watch/") @@ -278,7 +280,7 @@ class TestEmbedFilter(TestCase): result = embed_filter('http://www.youtube.com/watch/') self.assertEqual(result, '') - @patch('six.moves.urllib.request.urlopenn') + @patch('six.moves.urllib.request.urlopen') @patch('json.loads') def test_render_filter(self, loads, urlopen): urlopen.return_value = self.dummy_response From 3248601cc1c91aa8e94d6f19cae23918c70395e4 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 1 Jul 2014 17:46:54 +0100 Subject: [PATCH 097/298] Fixed wagtailforms test --- wagtail/wagtailforms/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py index 0e162e16a..38903d2ff 100644 --- a/wagtail/wagtailforms/tests.py +++ b/wagtail/wagtailforms/tests.py @@ -258,5 +258,5 @@ class TestFormsSubmissions(TestCase): # Check response self.assertEqual(response.status_code, 200) - data_line = response.content.split("\n")[1] + data_line = response.content.decode().split("\n")[1] self.assertTrue('new@example.com' in data_line) From 01c9ffb552f4359e1109ce6dd0d89d6280c037db Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 11:07:21 +0100 Subject: [PATCH 098/298] Fixed unresolved merge conflict --- wagtail/wagtailadmin/tests/test_pages_views.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 7fe16d3b1..58c674f91 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -255,12 +255,11 @@ class TestPageCreation(TestCase, WagtailTestUtils): self.assertIsInstance(page, SimplePage) self.assertTrue(page.live) -<<<<<<< HEAD # Check that the page_published signal was fired self.assertTrue(signal_fired[0]) self.assertEqual(signal_page[0], page) self.assertEqual(signal_page[0], signal_page[0].specific) -======= + def test_create_simplepage_post_publish_scheduled(self): go_live_at = timezone.now() + timedelta(days=1) expire_at = timezone.now() + timedelta(days=2) @@ -288,7 +287,6 @@ class TestPageCreation(TestCase, WagtailTestUtils): # But Page won't be live self.assertFalse(page.live) self.assertTrue(page.status_string, "scheduled") ->>>>>>> master def test_create_simplepage_post_submit(self): # Create a moderator user for testing email From f7b9390202e45dfe0f50e5d20285f8c95889b237 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 2 Jul 2014 11:16:13 +0100 Subject: [PATCH 099/298] removed max-height transition until it can be done without bad effects on long forms --- .../wagtailadmin/static/wagtailadmin/scss/components/forms.scss | 2 -- .../static/wagtailadmin/scss/layouts/page-editor.scss | 1 - 2 files changed, 3 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index aa8968f04..3a8f67ba2 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -304,9 +304,7 @@ input[type=submit], input[type=reset], input[type=button], button{ } .multiple{ - @include transition(max-height 10s ease); padding:0; - max-height:10000px; max-width:1024px - 50px; overflow:hidden; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss index 241d1aff4..50e77748d 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss @@ -269,7 +269,6 @@ .multiple{ padding:0; - max-height:0px; } } From 1515d3b6d639d873217c68c80b7220f545a0bde1 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 2 Jul 2014 11:40:22 +0100 Subject: [PATCH 100/298] Note about Help develop me label --- README.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0e68b8c6b..e96542483 100644 --- a/README.rst +++ b/README.rst @@ -46,5 +46,9 @@ Wagtail supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 su Contributing ~~~~~~~~~~~~ -If you're a Python or Django developer, fork the repo and get stuck in! Send us a useful pull request and we'll post you a `t-shirt `_. Our immediate priorities are better docs, more tests, internationalisation and localisation. +If you're a Python or Django developer, fork the repo and get stuck in! + +We suggest you start by checking the ["Help develop me!"](https://github.com/torchbox/wagtail/issues?labels=Help+develop+me%21) label. + +Send us a useful pull request and we'll post you a `t-shirt `_. Our immediate priorities are better docs, more tests, internationalisation and localisation. From 4cd570c9791a29252f2641ae28139051f6b975ba Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 2 Jul 2014 11:41:38 +0100 Subject: [PATCH 101/298] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e96542483..b9bc632a4 100644 --- a/README.rst +++ b/README.rst @@ -48,7 +48,7 @@ Contributing ~~~~~~~~~~~~ If you're a Python or Django developer, fork the repo and get stuck in! -We suggest you start by checking the ["Help develop me!"](https://github.com/torchbox/wagtail/issues?labels=Help+develop+me%21) label. +We suggest you start by checking the `Help develop me! `_ label. Send us a useful pull request and we'll post you a `t-shirt `_. Our immediate priorities are better docs, more tests, internationalisation and localisation. From fee62898fcd2acdca15199385227803859c2533f Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Wed, 2 Jul 2014 11:44:39 +0100 Subject: [PATCH 102/298] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index b9bc632a4..341e8d2bf 100644 --- a/README.rst +++ b/README.rst @@ -50,5 +50,5 @@ If you're a Python or Django developer, fork the repo and get stuck in! We suggest you start by checking the `Help develop me! `_ label. -Send us a useful pull request and we'll post you a `t-shirt `_. Our immediate priorities are better docs, more tests, internationalisation and localisation. +Send us a useful pull request and we'll post you a `t-shirt `_. From 5c61f75b6874b0a37ed9ca57342a0acfa44838d4 Mon Sep 17 00:00:00 2001 From: dv Date: Wed, 2 Jul 2014 19:10:19 +0800 Subject: [PATCH 103/298] fix wrong closing tag --- wagtail/wagtailusers/templates/wagtailusers/list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailusers/templates/wagtailusers/list.html b/wagtail/wagtailusers/templates/wagtailusers/list.html index c31b0bed4..798ab7fb4 100644 --- a/wagtail/wagtailusers/templates/wagtailusers/list.html +++ b/wagtail/wagtailusers/templates/wagtailusers/list.html @@ -35,7 +35,7 @@ {{ user.username }} {% if user.is_superuser %}{% trans "Admin" %}{% endif %}
            {% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}
            - + {% endfor %} - \ No newline at end of file + From 29896dcf5e42dd4af59f68b068ab6727640e6aea Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 12:30:32 +0100 Subject: [PATCH 104/298] Take a copy of parents indexed fields before modifying it to prevent indexed fields configuration being changed accidentally --- wagtail/wagtailsearch/indexed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index 60c56c8b4..0b607a2c7 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -50,7 +50,7 @@ class Indexed(object): parent = cls.indexed_get_parent(require_model=False) if parent: # Add parent fields into this list - parent_indexed_fields = parent.indexed_get_indexed_fields() + parent_indexed_fields = parent.indexed_get_indexed_fields().copy() parent_indexed_fields.update(indexed_fields) indexed_fields = parent_indexed_fields return indexed_fields From ea28584b8bbbebbcf70ff213760f2c699ef58549 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 12:37:29 +0100 Subject: [PATCH 105/298] indexed_get_indexed_fields should always return a copy of the configuration (even it its already a dict) --- wagtail/wagtailsearch/indexed.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index 0b607a2c7..e4e8b87cb 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -37,20 +37,25 @@ class Indexed(object): def indexed_get_indexed_fields(cls): # Get indexed fields for this class as dictionary indexed_fields = cls.indexed_fields - if isinstance(indexed_fields, tuple): - indexed_fields = list(indexed_fields) - if isinstance(indexed_fields, string_types): - indexed_fields = [indexed_fields] - if isinstance(indexed_fields, list): - indexed_fields = dict((field, dict(type="string")) for field in indexed_fields) - if not isinstance(indexed_fields, dict): - raise ValueError() + if isinstance(indexed_fields, dict): + # Make sure we have a copy to prevent us accidentally changing the configuration + indexed_fields = indexed_fields.copy() + else: + # Convert to dict + if isinstance(indexed_fields, tuple): + indexed_fields = list(indexed_fields) + if isinstance(indexed_fields, string_types): + indexed_fields = [indexed_fields] + if isinstance(indexed_fields, list): + indexed_fields = dict((field, dict(type="string")) for field in indexed_fields) + if not isinstance(indexed_fields, dict): + raise ValueError() # Get indexed fields for parent class parent = cls.indexed_get_parent(require_model=False) if parent: # Add parent fields into this list - parent_indexed_fields = parent.indexed_get_indexed_fields().copy() + parent_indexed_fields = parent.indexed_get_indexed_fields() parent_indexed_fields.update(indexed_fields) indexed_fields = parent_indexed_fields return indexed_fields From f642e78f60897cc0ed7147ee79f1de0727fe981c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 12:52:09 +0100 Subject: [PATCH 106/298] Removed get_internal_paths I've changed my mind about this. --- wagtail/wagtailcore/models.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index c1e48750b..294f5d40b 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -623,22 +623,14 @@ class Page(MP_Node, ClusterableModel, Indexed): """ return self.serve(self.dummy_request()) - def get_internal_paths(self): - """ - This returns a list of paths within this page. - This is used for static sites, sitemaps and cache invalidation. - """ - return ['/'] - def get_sitemap_urls(self): latest_revision = self.get_latest_revision() return [ { - 'location': self.url + url[1:], + 'location': self.url, 'lastmod': latest_revision.created_at if latest_revision else None } - for url in self.get_internal_paths() ] def get_static_site_paths(self): @@ -646,9 +638,8 @@ class Page(MP_Node, ClusterableModel, Indexed): This is a generator of URL paths to feed into a static site generator Override this if you would like to create static versions of subpages """ - # Yield paths for this page - for url in self.get_internal_paths(): - yield url + # Yield path for this page + yield '/' # Yield paths for child pages for child in self.get_children().live(): From 3be8c0374ca0ce3ae3cea3b3f77ab188ce0e8a40 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 12:57:21 +0100 Subject: [PATCH 107/298] Improvements to sitemaps tests --- wagtail/contrib/wagtailsitemaps/tests.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/wagtail/contrib/wagtailsitemaps/tests.py b/wagtail/contrib/wagtailsitemaps/tests.py index 4adf3f98b..fd639e4ec 100644 --- a/wagtail/contrib/wagtailsitemaps/tests.py +++ b/wagtail/contrib/wagtailsitemaps/tests.py @@ -1,5 +1,6 @@ from django.test import TestCase from django.core.urlresolvers import reverse +from django.core.cache import cache from wagtail.wagtailcore.models import Page, Site from wagtail.tests.models import SimplePage @@ -46,6 +47,9 @@ class TestSitemapGenerator(TestCase): # Check that a URL has made it into the xml self.assertIn('/hello-world/', xml) + # Make sure the unpublished page didn't make it into the xml + self.assertNotIn('/unpublished/', xml) + class TestSitemapView(TestCase): def test_sitemap_view(self): @@ -56,11 +60,20 @@ class TestSitemapView(TestCase): self.assertEqual(response['Content-Type'], 'text/xml; charset=utf-8') def test_sitemap_view_cache(self): + cache_key = 'wagtail-sitemap:%d' % Site.objects.get(is_default_site=True).id + + # Check that the key is not in the cache + self.assertFalse(cache.has_key(cache_key)) + + # Hit the view first_response = self.client.get('/sitemap.xml') self.assertEqual(first_response.status_code, 200) self.assertTemplateUsed(first_response, 'wagtailsitemaps/sitemap.xml') + # Check that the key is in the cache + self.assertTrue(cache.has_key(cache_key)) + # Hit the view again. Should come from the cache this time second_response = self.client.get('/sitemap.xml') From 61fd67f2e9e4920ea2412f03363f5a54c598c804 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 13:01:49 +0100 Subject: [PATCH 108/298] Tweaks to sitemap generation docs --- docs/sitemap_generation.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sitemap_generation.rst b/docs/sitemap_generation.rst index 3308a8f4c..a750eadc1 100644 --- a/docs/sitemap_generation.rst +++ b/docs/sitemap_generation.rst @@ -31,7 +31,7 @@ Then, in urls.py, you need to add a link to the ``wagtail.contrib.wagtailsitemap ) -You should now be able to browse to "/sitemap.xml" and see the sitemap working. +You should now be able to browse to "/sitemap.xml" and see the sitemap working. By default, all published pages in your website will be added to the site map. Customising @@ -40,7 +40,7 @@ Customising URLs ---- -The Page class defines a ``get_sitemap_urls`` method which you can override to customise sitemaps per page type. This method must return a list of dictionaries, one dictionary per URL entry in the sitemap. You can exclude pages from the sitemap by returning an empty list. +The Page class defines a ``get_sitemap_urls`` method which you can override to customise sitemaps per page instance. This method must return a list of dictionaries, one dictionary per URL entry in the sitemap. You can exclude pages from the sitemap by returning an empty list. Each dictionary can contain the following: @@ -49,10 +49,10 @@ Each dictionary can contain the following: - **changefreq** - **priority** -You can add more but you will need to override the ``wagtailsitemaps/sitemap.xml`` template in order for them to be displayed in the sitemap. +You can add more but yoBy default, all published pages in your website will be added to the site map.u will need to override the ``wagtailsitemaps/sitemap.xml`` template in order for them to be displayed in the sitemap. Cache ----- -By default, sitemaps are cached for 100 minutes. You can change this by setting ``WAGTAILSITEMAPS_CACHE_TIMEOUT`` in your Django settings to the number of seconds you would like to cache to last for. +By default, sitemaps are cached for 100 minutes. You can change this by setting ``WAGTAILSITEMAPS_CACHE_TIMEOUT`` in your Django settings to the number of seconds you would like the cache to last for. From 8b4fc47c5697198d8456032fa85e868454f7a9bf Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 13:03:15 +0100 Subject: [PATCH 109/298] Removed get_internal_paths --- wagtail/wagtailcore/models.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 3e9cfd963..4da110b4d 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -686,27 +686,19 @@ class Page(MP_Node, ClusterableModel, Indexed): """ return self.serve(self.dummy_request()) - def get_internal_paths(self): - """ - This returns a list of paths within this page. - This is used for static sites, sitemaps and cache invalidation. - """ - return ['/'] - def get_cached_paths(self): """ This returns a list of paths to invalidate in a frontend cache """ - return self.get_internal_paths() + return ['/'] def get_static_site_paths(self): """ This is a generator of URL paths to feed into a static site generator Override this if you would like to create static versions of subpages """ - # Yield paths for this page - for url in self.get_internal_paths(): - yield url + # Yield paths for this page + yield '/' # Yield paths for child pages for child in self.get_children().live(): From ea292d05692c02024b82b917726daa6555278317 Mon Sep 17 00:00:00 2001 From: Neal Todd Date: Wed, 2 Jul 2014 13:12:13 +0100 Subject: [PATCH 110/298] Bump 1.6 testing from 1.6.2 to 1.6.5. Add job for python 3.4 (allowing failure for now). Add commented stub for 1.7.0 jobs when it's released (resulting in four jobs overall). --- .travis.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8764f2859..4dcfab09b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,16 @@ -# Python releases to test language: python +# Test matrix python: - - 2.7 -# Django releases + - 2.7 + - 3.4 env: - - DJANGO_VERSION=Django==1.6.2 + - DJANGO_VERSION=Django==1.6.5 + #- DJANGO_VERSION=Django==1.7.0 +matrix: + allow_failures: + - python: 3.4 + #- env: DJANGO_VERSION=Django==1.7.0 + fast_finish: true # Services services: - redis-server From 2f74885834b0e84b2d9e37edb93cd78aab2bce7a Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 13:45:43 +0100 Subject: [PATCH 111/298] Fixed bad paste --- docs/sitemap_generation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sitemap_generation.rst b/docs/sitemap_generation.rst index a750eadc1..9c6d50e48 100644 --- a/docs/sitemap_generation.rst +++ b/docs/sitemap_generation.rst @@ -49,7 +49,7 @@ Each dictionary can contain the following: - **changefreq** - **priority** -You can add more but yoBy default, all published pages in your website will be added to the site map.u will need to override the ``wagtailsitemaps/sitemap.xml`` template in order for them to be displayed in the sitemap. +You can add more but you will need to override the ``wagtailsitemaps/sitemap.xml`` template in order for them to be displayed in the sitemap. Cache From e6f47aa403f32558f4567e0b36890aec6d948a36 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 14:01:08 +0100 Subject: [PATCH 112/298] Take a copy of parents indexed fields before modifying it to prevent indexed fields configuration being changed accidentally --- wagtail/wagtailsearch/indexed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index e4e8b87cb..b53481727 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -55,7 +55,7 @@ class Indexed(object): parent = cls.indexed_get_parent(require_model=False) if parent: # Add parent fields into this list - parent_indexed_fields = parent.indexed_get_indexed_fields() + parent_indexed_fields = parent.indexed_get_indexed_fields().copy() parent_indexed_fields.update(indexed_fields) indexed_fields = parent_indexed_fields return indexed_fields From dd1b0ababeff09bdf10802aa61e61b9abf9e3155 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 14:44:02 +0100 Subject: [PATCH 113/298] Fixed check for user email address --- wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html index 1e1f7e9b3..901ee0ac1 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html @@ -70,7 +70,7 @@ {% blocktrans with last_mod=page.get_latest_revision.created_at %}Last modified: {{ last_mod }}{% endblocktrans %} {% if page.get_latest_revision.user %} {% blocktrans with modified_by=page.get_latest_revision.user.get_full_name|default:page.get_latest_revision.user.username %}by {{ modified_by }}{% endblocktrans %} - {% if request.user.email %} + {% if page.get_latest_revision.user.email %} {% endif %} {% endif %} From 4a922b990cc95406b9cb9e7d4f109ad8aca92ac1 Mon Sep 17 00:00:00 2001 From: Tom Talbot Date: Wed, 2 Jul 2014 16:57:14 +0100 Subject: [PATCH 114/298] Fix wagtailsnippets.tests.TestSnippetChooserPanel Fix wrong argument type passed to SnippetChooserPanel --- wagtail/wagtailsnippets/tests.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 6e18b3ba4..ab9b2427d 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -150,9 +150,7 @@ class TestSnippetChooserPanel(TestCase): fixtures = ['wagtail/tests/fixtures/test.json'] def setUp(self): - content_type = get_content_type_from_url_params('tests', - 'advert') - + content_type = Advert test_snippet = Advert.objects.get(id=1) edit_handler_class = get_snippet_edit_handler(Advert) @@ -170,7 +168,7 @@ class TestSnippetChooserPanel(TestCase): self.assertTrue('test_advert' in self.snippet_chooser_panel.render_as_field()) def test_render_js(self): - self.assertTrue("createSnippetChooser(fixPrefix('id_text'), 'contenttypes/contenttype');" + self.assertTrue("createSnippetChooser(fixPrefix('id_text'), 'tests/advert');" in self.snippet_chooser_panel.render_js()) From 38ca434aeb52f8396c2407b8c52cb9f10f4aa06c Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 2 Jul 2014 17:14:34 +0100 Subject: [PATCH 115/298] add tox tests for postgres on python3.3 and python3.4 --- tox.ini | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 11b8bb3a2..e1f888d6c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,17 @@ [deps] dj16= Django>=1.6,<1.7 - pyelasticsearch==0.6.1 - elasticutils==0.8.2 + elasticsearch==1.0.0 + mock==1.0.1 [tox] envlist = py26-dj16-postgres, py26-dj16-sqlite, py27-dj16-postgres, - py27-dj16-sqlite + py27-dj16-sqlite, + py33-dj16-postgres, + py34-dj16-postgres # mysql not currently supported # (wagtail.wagtailimages.tests.TestImageEditView currently fails with a @@ -17,6 +19,11 @@ envlist = # py26-dj16-mysql # py27-dj16-mysql +# South fails with sqlite on python3, because it tries to use DryRunMigrator which uses iteritems +# py33-dj16-sqlite, +# py34-dj16-sqlite + + [testenv] commands=./runtests.py @@ -67,3 +74,33 @@ deps = setenv = DATABASE_ENGINE=django.db.backends.mysql DATABASE_USER=wagtail + +[testenv:py33-dj16-postgres] +basepython=python3.3 +deps = + {[deps]dj16} + psycopg2==2.5.2 +setenv = + DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 + +[testenv:py33-dj16-sqlite] +basepython=python3.3 +deps = + {[deps]dj16} +setenv = + DATABASE_ENGINE=django.db.backends.sqlite3 + +[testenv:py34-dj16-postgres] +basepython=python3.4 +deps = + {[deps]dj16} + psycopg2==2.5.2 +setenv = + DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 + +[testenv:py34-dj16-sqlite] +basepython=python3.4 +deps = + {[deps]dj16} +setenv = + DATABASE_ENGINE=django.db.backends.sqlite3 From ab486a526a94f31704e5dc9076913b38ee63cecf Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 2 Jul 2014 17:16:19 +0100 Subject: [PATCH 116/298] update travis config to not accept failures on 3.4 --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dcfab09b..48c8494b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,6 @@ python: env: - DJANGO_VERSION=Django==1.6.5 #- DJANGO_VERSION=Django==1.7.0 -matrix: - allow_failures: - - python: 3.4 - #- env: DJANGO_VERSION=Django==1.7.0 - fast_finish: true # Services services: - redis-server From 442286463ffe8b8daa5ad72009a41a3bacf5fb87 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 2 Jul 2014 17:17:25 +0100 Subject: [PATCH 117/298] update setup.py with classifiers for Python3.3 and Python3.4 --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index fe8673f28..2d2939a9e 100644 --- a/setup.py +++ b/setup.py @@ -65,6 +65,8 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', 'Framework :: Django', 'Topic :: Internet :: WWW/HTTP :: Site Management', ], From e31ff7f3c4215e7bb85c138a6e2e22b9a677824b Mon Sep 17 00:00:00 2001 From: Neal Todd Date: Wed, 2 Jul 2014 17:31:06 +0100 Subject: [PATCH 118/298] Requirements version updates, documenting dependencies via requirements.io and updating supported python version docs. --- README.rst | 12 ++++++++---- requirements-dev.txt | 2 +- tox.ini | 10 +++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index 341e8d2bf..44f897b3b 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ :target: https://travis-ci.org/torchbox/wagtail .. image:: https://coveralls.io/repos/torchbox/wagtail/badge.png?branch=master&zxcv1 - :target: https://coveralls.io/r/torchbox/wagtail?branch=master + :target: https://coveralls.io/r/torchbox/wagtail?branch=master .. image:: https://pypip.in/v/wagtail/badge.png?zxcv :target: https://crate.io/packages/wagtail/ @@ -38,15 +38,19 @@ Getting started Documentation ~~~~~~~~~~~~~ -Available at `wagtail.readthedocs.org `_. and always being updated. +Available at `wagtail.readthedocs.org `_ and always being updated. Compatibility ~~~~~~~~~~~~~ -Wagtail supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support are in progress. +Wagtail supports Django 1.6.2+ on Python 2.6, 2.7, 3.3 and 3.4. + +Django 1.7 support is in progress pending further release candidate testing. + +Wagtail's dependencies are summarised at `requirements.io `_. Contributing ~~~~~~~~~~~~ -If you're a Python or Django developer, fork the repo and get stuck in! +If you're a Python or Django developer, fork the repo and get stuck in! We suggest you start by checking the `Help develop me! `_ label. diff --git a/requirements-dev.txt b/requirements-dev.txt index 4a9ff5c5e..1ddd2aa32 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ # For coverage and PEP8 linting coverage==3.7.1 -flake8==2.1.0 +flake8==2.1.1 mock==1.0.1 diff --git a/tox.ini b/tox.ini index e1f888d6c..c67a219b4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [deps] dj16= Django>=1.6,<1.7 - elasticsearch==1.0.0 + elasticsearch==1.1.0 mock==1.0.1 [tox] @@ -31,7 +31,7 @@ commands=./runtests.py basepython=python2.6 deps = {[deps]dj16} - psycopg2==2.5.2 + psycopg2==2.5.3 setenv = DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 @@ -55,7 +55,7 @@ setenv = basepython=python2.7 deps = {[deps]dj16} - psycopg2==2.5.2 + psycopg2==2.5.3 setenv = DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 @@ -79,7 +79,7 @@ setenv = basepython=python3.3 deps = {[deps]dj16} - psycopg2==2.5.2 + psycopg2==2.5.3 setenv = DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 @@ -94,7 +94,7 @@ setenv = basepython=python3.4 deps = {[deps]dj16} - psycopg2==2.5.2 + psycopg2==2.5.3 setenv = DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 From 80ea75d24495b77c1c4d4223ac28e7aebf12e6d5 Mon Sep 17 00:00:00 2001 From: Neal Todd Date: Wed, 2 Jul 2014 17:47:03 +0100 Subject: [PATCH 119/298] Bump flake8 to correct latest version. --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1ddd2aa32..b69c5d4e0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ # For coverage and PEP8 linting coverage==3.7.1 -flake8==2.1.1 +flake8==2.2.1 mock==1.0.1 From 0d5cabd1e7953e8e49c1a378be16ca389769feff Mon Sep 17 00:00:00 2001 From: Tom Dyson Date: Wed, 2 Jul 2014 17:50:03 +0100 Subject: [PATCH 120/298] Two new features in README --- README.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 44f897b3b..2866e6c8a 100644 --- a/README.rst +++ b/README.rst @@ -24,7 +24,9 @@ Wagtail is a Django content management system built originally for the `Royal Co * Support for tree-based content organisation * Optional preview->submit->approve workflow * Fast out of the box. `Varnish `_-friendly if you need it -* Excellent test coverage +* A simple `form builder `_ +* Optional `static site generation `_ +* Excellent `test coverage `_ Find out more at `wagtail.io `_. From a6637ffc18465e0e3005d8b5a730f94a926d6630 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 17:51:36 +0100 Subject: [PATCH 121/298] Added some missing changelog entries --- CHANGELOG.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8ebe93959..66fad83d8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,10 @@ Changelog 0.4 (xx.xx.20xx) ~~~~~~~~~~~~~~~~ * ElasticUtils/pyelasticsearch swapped for elasticsearch-py + * Python 3.3 and 3.4 support + * Added scheduled publishing + * Added frontend cache invalidator + * Added sitemap generator * Added notification preferences * Added 'original' as a resizing rule supported by the 'image' tag * Hallo.js updated to version 1.0.4 @@ -15,16 +19,22 @@ Changelog * Added styleguide (mainly for wagtail developers) * Aesthetic improvements to preview experience * 'image' tag now accepts extra keyword arguments to be output as attributes on the img tag + * Login screen redirects to dashboard if user is already logged in + * Renamed some template tag libraries + * Any extra arguments given to serve are now passed through to get_context and get_template * Added an 'attrs' property to image rendition objects to output src, width, height and alt attributes all in one go * Added 'construct_whitelister_element_rules' hook for customising the HTML whitelist used when saving rich text fields * Added 'in_menu' and 'not_in_menu' methods to PageQuerySet * Added 'get_next_siblings' and 'get_prev_siblings' to Page * Added init_new_page signal + * Added page_published signal * Fix: Animated GIFs are now coalesced before resizing * Fix: Wand backend clones images before modifying them * Fix: Admin breadcrumb now positioned correctly on mobile * Fix: Page chooser breadcrumb now updates the chooser modal instead of linking to Explorer * Fix: Embeds - Fixed crash when no HTML field is sent back from the embed provider + * Fix: Multiple sites with same hostname but different ports are now allowed + * Fix: No longer possible to create multiple sites with is_default_site = True 0.3.1 (03.06.2014) ~~~~~~~~~~~~~~~~~~ From 41ff7510098a4ef788b27b4ec3d0fcc774ba1d5c Mon Sep 17 00:00:00 2001 From: Neal Todd Date: Wed, 2 Jul 2014 17:57:15 +0100 Subject: [PATCH 122/298] Update index.rst --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 5d2344b18..c96e77f10 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,7 +3,7 @@ Welcome to Wagtail's documentation Wagtail is a modern, flexible CMS, built on Django. -It supports Django 1.6.2+ on Python 2.6 and 2.7. Django 1.7 and Python 3 support are in progress. +It supports Django 1.6.2+ on Python 2.6, 2.7, 3.3 and 3.4. Django 1.7 support is in progress pending further release candidate testing. .. toctree:: :maxdepth: 3 From 47c83e75b12ca345cb93e9ed9ca748fa98ac8302 Mon Sep 17 00:00:00 2001 From: Tom Dyson Date: Wed, 2 Jul 2014 17:57:30 +0100 Subject: [PATCH 123/298] Lets -> Let's --- docs/frontend_cache_purging.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/frontend_cache_purging.rst b/docs/frontend_cache_purging.rst index 1825e92d2..a949bdc6e 100644 --- a/docs/frontend_cache_purging.rst +++ b/docs/frontend_cache_purging.rst @@ -69,7 +69,7 @@ Another problem is pages that list other pages (such as a blog index) will not b This can be solved by using the ``purge_page_from_cache`` utility function which can be found in the ``wagtail.contrib.wagtailfrontendcache.utils`` module. -Lets take the the above BlogIndexPage as an example. We need to register a signal handler to run when one of the BlogPages get updated/deleted. This signal handler should call the ``purge_page_from_cache`` function on all BlogIndexPages that contain the BlogPage being updated/deleted. +Let's take the the above BlogIndexPage as an example. We need to register a signal handler to run when one of the BlogPages get updated/deleted. This signal handler should call the ``purge_page_from_cache`` function on all BlogIndexPages that contain the BlogPage being updated/deleted. .. code-block:: python From 7a80c8adca770bb4289d30d9a1504722b4524f02 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 2 Jun 2014 22:53:42 +0100 Subject: [PATCH 124/298] Move the 'hooks' module from wagtailadmin to wagtailcore Conflicts: wagtail/tests/wagtail_hooks.py wagtail/wagtailadmin/views/pages.py --- wagtail/tests/wagtail_hooks.py | 2 +- wagtail/wagtailadmin/hooks.py | 40 ++----------------- .../templatetags/wagtailadmin_tags.py | 2 +- wagtail/wagtailadmin/urls.py | 2 +- wagtail/wagtailadmin/views/home.py | 2 +- wagtail/wagtailadmin/views/pages.py | 3 +- wagtail/wagtailadmin/views/userbar.py | 2 +- wagtail/wagtailcore/hooks.py | 38 ++++++++++++++++++ wagtail/wagtaildocs/wagtail_hooks.py | 2 +- wagtail/wagtailembeds/wagtail_hooks.py | 2 +- wagtail/wagtailforms/wagtail_hooks.py | 2 +- wagtail/wagtailimages/wagtail_hooks.py | 2 +- wagtail/wagtailredirects/wagtail_hooks.py | 2 +- wagtail/wagtailsearch/wagtail_hooks.py | 2 +- wagtail/wagtailsnippets/wagtail_hooks.py | 2 +- wagtail/wagtailusers/wagtail_hooks.py | 2 +- 16 files changed, 56 insertions(+), 51 deletions(-) create mode 100644 wagtail/wagtailcore/hooks.py diff --git a/wagtail/tests/wagtail_hooks.py b/wagtail/tests/wagtail_hooks.py index 5dccca666..13e3e46d2 100644 --- a/wagtail/tests/wagtail_hooks.py +++ b/wagtail/tests/wagtail_hooks.py @@ -1,4 +1,4 @@ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes def editor_css(): diff --git a/wagtail/wagtailadmin/hooks.py b/wagtail/wagtailadmin/hooks.py index d299c3346..75c3a8991 100644 --- a/wagtail/wagtailadmin/hooks.py +++ b/wagtail/wagtailadmin/hooks.py @@ -1,38 +1,4 @@ -from django.conf import settings -try: - from importlib import import_module -except ImportError: - # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7) - from django.utils.importlib import import_module +# The 'hooks' module is now part of wagtailcore. +# Imports are provided here for backwards compatibility -_hooks = {} - -# TODO: support 'register' as a decorator: -# @hooks.register('construct_main_menu') -# def construct_main_menu(menu_items): -# ... - - -def register(hook_name, fn): - if hook_name not in _hooks: - _hooks[hook_name] = [] - _hooks[hook_name].append(fn) - -_searched_for_hooks = False - - -def search_for_hooks(): - global _searched_for_hooks - if not _searched_for_hooks: - for app_module in settings.INSTALLED_APPS: - try: - import_module('%s.wagtail_hooks' % app_module) - except ImportError: - continue - - _searched_for_hooks = True - - -def get_hooks(hook_name): - search_for_hooks() - return _hooks.get(hook_name, []) +from wagtail.wagtailcore.hooks import register, get_hooks diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py index 9f03c7b63..4a4d4d0eb 100644 --- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py +++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py @@ -2,9 +2,9 @@ from django import template from django.core import urlresolvers from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks from wagtail.wagtailadmin.menu import MenuItem +from wagtail.wagtailcore import hooks from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy from wagtail.wagtailcore.utils import camelcase_to_underscore diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py index 35bb63d5e..7ef2eb110 100644 --- a/wagtail/wagtailadmin/urls.py +++ b/wagtail/wagtailadmin/urls.py @@ -3,7 +3,7 @@ from django.conf import settings from wagtail.wagtailadmin.forms import LoginForm, PasswordResetForm from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks urlpatterns = [ diff --git a/wagtail/wagtailadmin/views/home.py b/wagtail/wagtailadmin/views/home.py index 24800eefc..e68ed0cbf 100644 --- a/wagtail/wagtailadmin/views/home.py +++ b/wagtail/wagtailadmin/views/home.py @@ -4,9 +4,9 @@ from django.conf import settings from django.template import RequestContext from django.template.loader import render_to_string -from wagtail.wagtailadmin import hooks from wagtail.wagtailadmin.forms import SearchForm +from wagtail.wagtailcore import hooks from wagtail.wagtailcore.models import Page, PageRevision, UserPagePermissionsProxy from wagtail.wagtaildocs.models import Document diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 1bc13c5f0..fd0c97b02 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -11,8 +11,9 @@ from django.views.decorators.vary import vary_on_headers from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailadmin import tasks, hooks, signals +from wagtail.wagtailadmin import tasks, signals +from wagtail.wagtailcore import hooks from wagtail.wagtailcore.models import Page, PageRevision from wagtail.wagtailcore.signals import page_published diff --git a/wagtail/wagtailadmin/views/userbar.py b/wagtail/wagtailadmin/views/userbar.py index 2b3749da0..c41b5aed1 100644 --- a/wagtail/wagtailadmin/views/userbar.py +++ b/wagtail/wagtailadmin/views/userbar.py @@ -2,7 +2,7 @@ from django.shortcuts import render from django.contrib.auth.decorators import permission_required from wagtail.wagtailadmin.userbar import EditPageItem, AddPageItem, ApproveModerationEditPageItem, RejectModerationEditPageItem -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailcore.models import Page, PageRevision diff --git a/wagtail/wagtailcore/hooks.py b/wagtail/wagtailcore/hooks.py new file mode 100644 index 000000000..d299c3346 --- /dev/null +++ b/wagtail/wagtailcore/hooks.py @@ -0,0 +1,38 @@ +from django.conf import settings +try: + from importlib import import_module +except ImportError: + # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7) + from django.utils.importlib import import_module + +_hooks = {} + +# TODO: support 'register' as a decorator: +# @hooks.register('construct_main_menu') +# def construct_main_menu(menu_items): +# ... + + +def register(hook_name, fn): + if hook_name not in _hooks: + _hooks[hook_name] = [] + _hooks[hook_name].append(fn) + +_searched_for_hooks = False + + +def search_for_hooks(): + global _searched_for_hooks + if not _searched_for_hooks: + for app_module in settings.INSTALLED_APPS: + try: + import_module('%s.wagtail_hooks' % app_module) + except ImportError: + continue + + _searched_for_hooks = True + + +def get_hooks(hook_name): + search_for_hooks() + return _hooks.get(hook_name, []) diff --git a/wagtail/wagtaildocs/wagtail_hooks.py b/wagtail/wagtaildocs/wagtail_hooks.py index 3ab1ad9bf..a6e00f8db 100644 --- a/wagtail/wagtaildocs/wagtail_hooks.py +++ b/wagtail/wagtaildocs/wagtail_hooks.py @@ -4,7 +4,7 @@ from django.core import urlresolvers from django.utils.html import format_html, format_html_join from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtaildocs import admin_urls diff --git a/wagtail/wagtailembeds/wagtail_hooks.py b/wagtail/wagtailembeds/wagtail_hooks.py index 89c5e66a5..f9ea650a6 100644 --- a/wagtail/wagtailembeds/wagtail_hooks.py +++ b/wagtail/wagtailembeds/wagtail_hooks.py @@ -3,7 +3,7 @@ from django.conf.urls import include, url from django.core import urlresolvers from django.utils.html import format_html -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailembeds import urls diff --git a/wagtail/wagtailforms/wagtail_hooks.py b/wagtail/wagtailforms/wagtail_hooks.py index 277fc6e73..c584a5c4e 100644 --- a/wagtail/wagtailforms/wagtail_hooks.py +++ b/wagtail/wagtailforms/wagtail_hooks.py @@ -3,7 +3,7 @@ from django.conf import settings from django.conf.urls import include, url from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailforms import urls diff --git a/wagtail/wagtailimages/wagtail_hooks.py b/wagtail/wagtailimages/wagtail_hooks.py index 51492d404..611e18990 100644 --- a/wagtail/wagtailimages/wagtail_hooks.py +++ b/wagtail/wagtailimages/wagtail_hooks.py @@ -4,7 +4,7 @@ from django.core import urlresolvers from django.utils.html import format_html, format_html_join from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailimages import urls diff --git a/wagtail/wagtailredirects/wagtail_hooks.py b/wagtail/wagtailredirects/wagtail_hooks.py index 4dbe1a028..6ebec475b 100644 --- a/wagtail/wagtailredirects/wagtail_hooks.py +++ b/wagtail/wagtailredirects/wagtail_hooks.py @@ -2,7 +2,7 @@ from django.core import urlresolvers from django.conf.urls import include, url from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailredirects import urls from wagtail.wagtailadmin.menu import MenuItem diff --git a/wagtail/wagtailsearch/wagtail_hooks.py b/wagtail/wagtailsearch/wagtail_hooks.py index 1a656c0ef..3ca4601b3 100644 --- a/wagtail/wagtailsearch/wagtail_hooks.py +++ b/wagtail/wagtailsearch/wagtail_hooks.py @@ -2,7 +2,7 @@ from django.core import urlresolvers from django.conf.urls import include, url from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailsearch.urls import admin as admin_urls from wagtail.wagtailadmin.menu import MenuItem diff --git a/wagtail/wagtailsnippets/wagtail_hooks.py b/wagtail/wagtailsnippets/wagtail_hooks.py index 3745d1a51..501f29b31 100644 --- a/wagtail/wagtailsnippets/wagtail_hooks.py +++ b/wagtail/wagtailsnippets/wagtail_hooks.py @@ -4,7 +4,7 @@ from django.core import urlresolvers from django.utils.html import format_html from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailsnippets import urls diff --git a/wagtail/wagtailusers/wagtail_hooks.py b/wagtail/wagtailusers/wagtail_hooks.py index d006a4d93..6637430e1 100644 --- a/wagtail/wagtailusers/wagtail_hooks.py +++ b/wagtail/wagtailusers/wagtail_hooks.py @@ -2,7 +2,7 @@ from django.conf.urls import include, url from django.core import urlresolvers from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailusers import urls From 618dd96a88b9cb98c9f45ee2f63520bb472d6dc2 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 2 Jul 2014 20:02:25 +0100 Subject: [PATCH 125/298] update wagtailstyleguide and wagtailcore.rich_text to import hooks from wagtailcore rather than wagtailadmin --- wagtail/contrib/wagtailstyleguide/wagtail_hooks.py | 2 +- wagtail/wagtailcore/rich_text.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py index ae2989be9..c2899b38e 100644 --- a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py +++ b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py @@ -4,7 +4,7 @@ from django.core import urlresolvers from django.utils.html import format_html, format_html_join from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailimages import urls diff --git a/wagtail/wagtailcore/rich_text.py b/wagtail/wagtailcore/rich_text.py index c5229f747..bd218d01d 100644 --- a/wagtail/wagtailcore/rich_text.py +++ b/wagtail/wagtailcore/rich_text.py @@ -13,7 +13,7 @@ from wagtail.wagtaildocs.models import Document from wagtail.wagtailimages.models import get_image_model from wagtail.wagtailimages.formats import get_image_format -from wagtail.wagtailadmin import hooks +from wagtail.wagtailcore import hooks # Define a set of 'embed handlers' and 'link handlers'. These handle the translation From 92dc6add90c8c1b85d75a0477ac047671ced4819 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 2 Jul 2014 20:04:06 +0100 Subject: [PATCH 126/298] update hook examples in docs to import from wagtailcore, not wagtailadmin --- docs/editing_api.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/editing_api.rst b/docs/editing_api.rst index 609237e76..5113eb3b8 100644 --- a/docs/editing_api.rst +++ b/docs/editing_api.rst @@ -396,7 +396,7 @@ Registering functions with a Wagtail hook follows the following pattern: .. code-block:: python - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks hooks.register('hook', function) @@ -409,7 +409,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func .. code-block:: python - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks class UserbarPuppyLinkItem(object): def render(self, request): @@ -430,7 +430,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.utils.safestring import mark_safe - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks class WelcomePanel(object): order = 50 @@ -456,7 +456,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.http import HttpResponse - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks def do_after_page_create(request, page): return HttpResponse("Congrats on making content!", content_type="text/plain") @@ -484,7 +484,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.http import HttpResponse from django.conf.urls import url - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks def admin_view( request ): return HttpResponse( \ @@ -506,7 +506,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.core.urlresolvers import reverse - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks from wagtail.wagtailadmin.menu import MenuItem def construct_main_menu(request, menu_items): @@ -526,7 +526,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.utils.html import format_html, format_html_join from django.conf import settings - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks def editor_js(): js_files = [ @@ -554,7 +554,7 @@ Where ``'hook'`` is one of the following hook strings and ``function`` is a func from django.utils.html import format_html from django.conf import settings - from wagtail.wagtailadmin import hooks + from wagtail.wagtailcore import hooks def editor_css(): return format_html('') @patch('six.moves.urllib.request.urlopen') @@ -336,7 +344,7 @@ class TestEmbedlyFilter(TestEmbedFilter): urlopen.return_value = self.dummy_response loads.return_value = {'type': 'foo', 'url': 'http://www.example.com'} - temp = template.Template('{% load embed_filters %}{{ "http://www.youtube.com/watch/"|embedly }}') + temp = template.Template('{% load wagtailembeds_tags %}{{ "http://www.youtube.com/watch/"|embedly }}') context = template.Context() result = temp.render(context) self.assertEqual(result, '') From 352c7ce8f5a3e7d841d996251ec331cfdd65867d Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 2 Jul 2014 21:05:16 +0100 Subject: [PATCH 128/298] replace assertEquals with assertEqual to prevent deprecation warnings on python 3 --- wagtail/wagtailadmin/tests/test_pages_views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 58c674f91..2e54218bf 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -190,9 +190,9 @@ class TestPageCreation(TestCase, WagtailTestUtils): # Find the page and check the scheduled times page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific - self.assertEquals(page.go_live_at.date(), go_live_at.date()) - self.assertEquals(page.expire_at.date(), expire_at.date()) - self.assertEquals(page.expired, False) + self.assertEqual(page.go_live_at.date(), go_live_at.date()) + self.assertEqual(page.expire_at.date(), expire_at.date()) + self.assertEqual(page.expired, False) self.assertTrue(page.status_string, "draft") # No revisions with approved_go_live_at @@ -278,9 +278,9 @@ class TestPageCreation(TestCase, WagtailTestUtils): # Find the page and check it page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific - self.assertEquals(page.go_live_at.date(), go_live_at.date()) - self.assertEquals(page.expire_at.date(), expire_at.date()) - self.assertEquals(page.expired, False) + self.assertEqual(page.go_live_at.date(), go_live_at.date()) + self.assertEqual(page.expire_at.date(), expire_at.date()) + self.assertEqual(page.expired, False) # A revision with approved_go_live_at should exist now self.assertTrue(PageRevision.objects.filter(page=page).exclude(approved_go_live_at__isnull=True).exists()) From 79de8bf88439fe56f6e24ae186c1f9365837ee3f Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 2 Jul 2014 21:19:29 +0100 Subject: [PATCH 129/298] replace assertRegexpMatches with six.assertRegex to prevent deprecation warnings on python 3 --- wagtail/wagtailimages/tests.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailimages/tests.py b/wagtail/wagtailimages/tests.py index af4f305e7..48a31ae89 100644 --- a/wagtail/wagtailimages/tests.py +++ b/wagtail/wagtailimages/tests.py @@ -1,4 +1,5 @@ from mock import MagicMock +from django.utils import six from django.test import TestCase from django import template @@ -453,16 +454,14 @@ class TestFormat(TestCase): self.image, 'test alt text' ) - self.assertRegexpMatches( - result, + six.assertRegex(self, result, 'test alt text', - ) + ) def test_image_to_html_no_classnames(self): self.format.classnames = None result = self.format.image_to_html(self.image, 'test alt text') - self.assertRegexpMatches( - result, + six.assertRegex(self, result, 'test alt text' ) self.format.classnames = 'test classnames' From 76b720721adf36f1894e5f84b46d502f2e8e9ad0 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 21:43:15 +0100 Subject: [PATCH 130/298] Removed unicode literals for Python 3.2 support --- wagtail/wagtailadmin/edit_handlers.py | 6 +- wagtail/wagtailadmin/menu.py | 4 +- .../0001_create_admin_access_permissions.py | 22 ++-- .../templatetags/wagtailadmin_tags.py | 4 +- .../tests/test_account_management.py | 8 +- .../wagtailcore/migrations/0001_initial.py | 88 ++++++++------- .../migrations/0002_initial_data.py | 56 ++++----- ...hostname__add_unique_site_hostname_port.py | 66 +++++------ .../0004_fields_for_scheduled_publishing.py | 74 ++++++------ .../wagtaildocs/migrations/0001_initial.py | 40 +++---- .../migrations/0002_initial_data.py | 38 ++++--- .../wagtailembeds/migrations/0001_initial.py | 18 +-- ...hor_name__add_field_embed_provider_name.py | 14 ++- .../wagtailforms/migrations/0001_initial.py | 48 ++++---- .../wagtailimages/migrations/0001_initial.py | 72 ++++++------ .../migrations/0002_initial_data.py | 50 +++++---- .../migrations/0001_initial.py | 46 ++++---- .../wagtailsearch/migrations/0001_initial.py | 106 +++++++++--------- .../0002_auto__add_field_searchtest_live.py | 66 +++++------ .../migrations/0002_add_user_profile_model.py | 40 +++---- 20 files changed, 453 insertions(+), 413 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 638072fa8..35dad33da 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import copy import re import datetime @@ -253,7 +255,7 @@ class EditHandler(object): if field_name not in rendered_fields ] - return mark_safe(u''.join(missing_fields_html)) + return mark_safe(''.join(missing_fields_html)) def render_form_content(self): """ @@ -307,7 +309,7 @@ class BaseCompositeEditHandler(EditHandler): })) def render_js(self): - return mark_safe(u'\n'.join([handler.render_js() for handler in self.children])) + return mark_safe('\n'.join([handler.render_js() for handler in self.children])) def rendered_fields(self): result = [] diff --git a/wagtail/wagtailadmin/menu.py b/wagtail/wagtailadmin/menu.py index dcc241baa..74e3c406c 100644 --- a/wagtail/wagtailadmin/menu.py +++ b/wagtail/wagtailadmin/menu.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from six import text_type from django.utils.text import slugify @@ -14,5 +16,5 @@ class MenuItem(object): def render_html(self): return format_html( - u"""
          • {3}
            • """, + """
          • {3}
            • """, self.name, self.url, self.classnames, self.label) diff --git a/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py b/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py index b9ef11382..44a6c1b62 100644 --- a/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py +++ b/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import DataMigration @@ -20,7 +22,7 @@ class Migration(DataMigration): wagtailadmin_content_type = orm['contenttypes.ContentType'].objects.create( app_label='wagtailadmin', model='admin', name='Wagtail admin') admin_permission = orm['auth.permission'].objects.create( - content_type=wagtailadmin_content_type, codename='access_admin', name=u'Can access Wagtail admin') + content_type=wagtailadmin_content_type, codename='access_admin', name='Can access Wagtail admin') for group in orm['auth.group'].objects.filter(name__in=['Editors', 'Moderators']): group.permissions.add(admin_permission) @@ -32,23 +34,23 @@ class Migration(DataMigration): wagtailadmin_content_type.delete() models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py index 9f03c7b63..d229dc545 100644 --- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py +++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django import template from django.core import urlresolvers from django.utils.translation import ugettext_lazy as _ @@ -95,4 +97,4 @@ def hook_output(hook_name): Note that the output is not escaped - it is the hook function's responsibility to escape unsafe content. """ snippets = [fn() for fn in hooks.get_hooks(hook_name)] - return u''.join(snippets) + return ''.join(snippets) diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py index 7128f8885..78b07351e 100644 --- a/wagtail/wagtailadmin/tests/test_account_management.py +++ b/wagtail/wagtailadmin/tests/test_account_management.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + from django.test import TestCase from django.core.urlresolvers import reverse from django.contrib.auth.models import User, Group, Permission @@ -198,9 +200,9 @@ class TestAccountSection(TestCase, WagtailTestUtils): """ # Post new values to the notification preferences page post_data = { - 'submitted_notifications': u'false', - 'approved_notifications': u'false', - 'rejected_notifications': u'true', + 'submitted_notifications': 'false', + 'approved_notifications': 'false', + 'rejected_notifications': 'true', } response = self.client.post(reverse('wagtailadmin_account_notification_preferences'), post_data) diff --git a/wagtail/wagtailcore/migrations/0001_initial.py b/wagtail/wagtailcore/migrations/0001_initial.py index 954bc38c5..31af299fc 100644 --- a/wagtail/wagtailcore/migrations/0001_initial.py +++ b/wagtail/wagtailcore/migrations/0001_initial.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -11,18 +13,18 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'Site' - db.create_table(u'wagtailcore_site', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailcore_site', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('hostname', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255, db_index=True)), ('port', self.gf('django.db.models.fields.IntegerField')(default=80)), ('root_page', self.gf('django.db.models.fields.related.ForeignKey')(related_name='sites_rooted_here', to=orm['wagtailcore.Page'])), ('is_default_site', self.gf('django.db.models.fields.BooleanField')(default=False)), )) - db.send_create_signal(u'wagtailcore', ['Site']) + db.send_create_signal('wagtailcore', ['Site']) # Adding model 'Page' - db.create_table(u'wagtailcore_page', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailcore_page', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('path', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)), ('depth', self.gf('django.db.models.fields.PositiveIntegerField')()), ('numchild', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)), @@ -37,55 +39,55 @@ class Migration(SchemaMigration): ('show_in_menus', self.gf('django.db.models.fields.BooleanField')(default=False)), ('search_description', self.gf('django.db.models.fields.TextField')(blank=True)), )) - db.send_create_signal(u'wagtailcore', ['Page']) + db.send_create_signal('wagtailcore', ['Page']) # Adding model 'PageRevision' - db.create_table(u'wagtailcore_pagerevision', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailcore_pagerevision', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('page', self.gf('django.db.models.fields.related.ForeignKey')(related_name='revisions', to=orm['wagtailcore.Page'])), ('submitted_for_moderation', self.gf('django.db.models.fields.BooleanField')(default=False)), ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL], null=True, blank=True)), ('content_json', self.gf('django.db.models.fields.TextField')()), )) - db.send_create_signal(u'wagtailcore', ['PageRevision']) + db.send_create_signal('wagtailcore', ['PageRevision']) # Adding model 'GroupPagePermission' - db.create_table(u'wagtailcore_grouppagepermission', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailcore_grouppagepermission', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('group', self.gf('django.db.models.fields.related.ForeignKey')(related_name='page_permissions', to=orm['auth.Group'])), ('page', self.gf('django.db.models.fields.related.ForeignKey')(related_name='group_permissions', to=orm['wagtailcore.Page'])), ('permission_type', self.gf('django.db.models.fields.CharField')(max_length=20)), )) - db.send_create_signal(u'wagtailcore', ['GroupPagePermission']) + db.send_create_signal('wagtailcore', ['GroupPagePermission']) def backwards(self, orm): # Deleting model 'Site' - db.delete_table(u'wagtailcore_site') + db.delete_table('wagtailcore_site') # Deleting model 'Page' - db.delete_table(u'wagtailcore_page') + db.delete_table('wagtailcore_page') # Deleting model 'PageRevision' - db.delete_table(u'wagtailcore_pagerevision') + db.delete_table('wagtailcore_pagerevision') # Deleting model 'GroupPagePermission' - db.delete_table(u'wagtailcore_grouppagepermission') + db.delete_table('wagtailcore_grouppagepermission') models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -93,40 +95,40 @@ class Migration(SchemaMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.grouppagepermission': { + 'wagtailcore.grouppagepermission': { 'Meta': {'object_name': 'GroupPagePermission'}, - 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': u"orm['wagtailcore.Page']"}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': "orm['wagtailcore.Page']"}), 'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['%s']" % AUTH_USER_MODEL}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['%s']" % AUTH_USER_MODEL}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), @@ -135,22 +137,22 @@ class Migration(SchemaMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailcore.pagerevision': { + 'wagtailcore.pagerevision': { 'Meta': {'object_name': 'PageRevision'}, 'content_json': ('django.db.models.fields.TextField', [], {}), 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': u"orm['wagtailcore.Page']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': "orm['wagtailcore.Page']"}), 'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}) }, - u'wagtailcore.site': { + 'wagtailcore.site': { 'Meta': {'object_name': 'Site'}, 'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), - 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"}) + 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': "orm['wagtailcore.Page']"}) } } diff --git a/wagtail/wagtailcore/migrations/0002_initial_data.py b/wagtail/wagtailcore/migrations/0002_initial_data.py index 668f554bd..bb0b5f3b9 100644 --- a/wagtail/wagtailcore/migrations/0002_initial_data.py +++ b/wagtail/wagtailcore/migrations/0002_initial_data.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import DataMigration @@ -61,17 +63,17 @@ class Migration(DataMigration): orm['wagtailcore.page'].objects.all().delete() models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -79,40 +81,40 @@ class Migration(DataMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.grouppagepermission': { + 'wagtailcore.grouppagepermission': { 'Meta': {'object_name': 'GroupPagePermission'}, - 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': u"orm['wagtailcore.Page']"}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': "orm['wagtailcore.Page']"}), 'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['%s']" % AUTH_USER_MODEL}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['%s']" % AUTH_USER_MODEL}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), @@ -121,22 +123,22 @@ class Migration(DataMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailcore.pagerevision': { + 'wagtailcore.pagerevision': { 'Meta': {'object_name': 'PageRevision'}, 'content_json': ('django.db.models.fields.TextField', [], {}), 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': u"orm['wagtailcore.Page']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': "orm['wagtailcore.Page']"}), 'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}) }, - u'wagtailcore.site': { + 'wagtailcore.site': { 'Meta': {'object_name': 'Site'}, 'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), - 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"}) + 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': "orm['wagtailcore.Page']"}) } } diff --git a/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py b/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py index 16686e0a9..a7060ddc7 100644 --- a/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py +++ b/wagtail/wagtailcore/migrations/0003_auto__del_unique_site_hostname__add_unique_site_hostname_port.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -9,73 +11,73 @@ class Migration(SchemaMigration): def forwards(self, orm): # Removing unique constraint on 'Site', fields ['hostname'] - db.delete_unique(u'wagtailcore_site', ['hostname']) + db.delete_unique('wagtailcore_site', ['hostname']) # Adding unique constraint on 'Site', fields ['hostname', 'port'] - db.create_unique(u'wagtailcore_site', ['hostname', 'port']) + db.create_unique('wagtailcore_site', ['hostname', 'port']) def backwards(self, orm): # Removing unique constraint on 'Site', fields ['hostname', 'port'] - db.delete_unique(u'wagtailcore_site', ['hostname', 'port']) + db.delete_unique('wagtailcore_site', ['hostname', 'port']) # Adding unique constraint on 'Site', fields ['hostname'] - db.create_unique(u'wagtailcore_site', ['hostname']) + db.create_unique('wagtailcore_site', ['hostname']) models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - u'auth.user': { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.grouppagepermission': { + 'wagtailcore.grouppagepermission': { 'Meta': {'object_name': 'GroupPagePermission'}, - 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': u"orm['wagtailcore.Page']"}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': "orm['wagtailcore.Page']"}), 'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['auth.User']"}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), @@ -84,22 +86,22 @@ class Migration(SchemaMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailcore.pagerevision': { + 'wagtailcore.pagerevision': { 'Meta': {'object_name': 'PageRevision'}, 'content_json': ('django.db.models.fields.TextField', [], {}), 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': u"orm['wagtailcore.Page']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': "orm['wagtailcore.Page']"}), 'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) }, - u'wagtailcore.site': { + 'wagtailcore.site': { 'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'}, 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), - 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"}) + 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': "orm['wagtailcore.Page']"}) } } diff --git a/wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py b/wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py index 40602fa97..9d53df617 100644 --- a/wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py +++ b/wagtail/wagtailcore/migrations/0004_fields_for_scheduled_publishing.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -9,96 +11,96 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding field 'PageRevision.approved_go_live_at' - db.add_column(u'wagtailcore_pagerevision', 'approved_go_live_at', + db.add_column('wagtailcore_pagerevision', 'approved_go_live_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), keep_default=False) # Adding field 'Page.go_live_at' - db.add_column(u'wagtailcore_page', 'go_live_at', + db.add_column('wagtailcore_page', 'go_live_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), keep_default=False) # Adding field 'Page.expire_at' - db.add_column(u'wagtailcore_page', 'expire_at', + db.add_column('wagtailcore_page', 'expire_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), keep_default=False) # Adding field 'Page.expired' - db.add_column(u'wagtailcore_page', 'expired', + db.add_column('wagtailcore_page', 'expired', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False) def backwards(self, orm): # Deleting field 'PageRevision.approved_go_live_at' - db.delete_column(u'wagtailcore_pagerevision', 'approved_go_live_at') + db.delete_column('wagtailcore_pagerevision', 'approved_go_live_at') # Deleting field 'Page.go_live_at' - db.delete_column(u'wagtailcore_page', 'go_live_at') + db.delete_column('wagtailcore_page', 'go_live_at') # Deleting field 'Page.expire_at' - db.delete_column(u'wagtailcore_page', 'expire_at') + db.delete_column('wagtailcore_page', 'expire_at') # Deleting field 'Page.expired' - db.delete_column(u'wagtailcore_page', 'expired') + db.delete_column('wagtailcore_page', 'expired') models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - u'auth.user': { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.grouppagepermission': { + 'wagtailcore.grouppagepermission': { 'Meta': {'object_name': 'GroupPagePermission'}, - 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': u"orm['wagtailcore.Page']"}), + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': "orm['wagtailcore.Page']"}), 'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), 'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['auth.User']"}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), @@ -107,23 +109,23 @@ class Migration(SchemaMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailcore.pagerevision': { + 'wagtailcore.pagerevision': { 'Meta': {'object_name': 'PageRevision'}, 'approved_go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), 'content_json': ('django.db.models.fields.TextField', [], {}), 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': u"orm['wagtailcore.Page']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': "orm['wagtailcore.Page']"}), 'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) }, - u'wagtailcore.site': { + 'wagtailcore.site': { 'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'}, 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), - 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"}) + 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': "orm['wagtailcore.Page']"}) } } diff --git a/wagtail/wagtaildocs/migrations/0001_initial.py b/wagtail/wagtaildocs/migrations/0001_initial.py index fb3805eb5..6c501ef7f 100644 --- a/wagtail/wagtaildocs/migrations/0001_initial.py +++ b/wagtail/wagtaildocs/migrations/0001_initial.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -15,8 +17,8 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'Document' - db.create_table(u'wagtaildocs_document', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtaildocs_document', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)), ('created_at', self.gf('django.db.models.fields.DateTimeField') @@ -24,24 +26,24 @@ class Migration(SchemaMigration): ('uploaded_by_user', self.gf('django.db.models.fields.related.ForeignKey') (to=orm[AUTH_USER_MODEL], null=True, blank=True)), )) - db.send_create_signal(u'wagtaildocs', ['Document']) + db.send_create_signal('wagtaildocs', ['Document']) def backwards(self, orm): # Deleting model 'Document' - db.delete_table(u'wagtaildocs_document') + db.delete_table('wagtaildocs_document') models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -49,31 +51,31 @@ class Migration(SchemaMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtaildocs.document': { + 'wagtaildocs.document': { 'Meta': {'object_name': 'Document'}, 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'uploaded_by_user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}) + 'uploaded_by_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}) } } diff --git a/wagtail/wagtaildocs/migrations/0002_initial_data.py b/wagtail/wagtaildocs/migrations/0002_initial_data.py index a23f79c88..6b58875c3 100644 --- a/wagtail/wagtaildocs/migrations/0002_initial_data.py +++ b/wagtail/wagtaildocs/migrations/0002_initial_data.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import DataMigration @@ -16,11 +18,11 @@ class Migration(DataMigration): document_content_type, created = orm['contenttypes.ContentType'].objects.get_or_create( model='document', app_label='wagtaildocs', defaults={'name': 'document'}) add_permission, created = orm['auth.permission'].objects.get_or_create( - content_type=document_content_type, codename='add_document', defaults=dict(name=u'Can add document')) + content_type=document_content_type, codename='add_document', defaults=dict(name='Can add document')) change_permission, created = orm['auth.permission'].objects.get_or_create( - content_type=document_content_type, codename='change_document', defaults=dict(name=u'Can change document')) + content_type=document_content_type, codename='change_document', defaults=dict(name='Can change document')) delete_permission, created = orm['auth.permission'].objects.get_or_create( - content_type=document_content_type, codename='delete_document', defaults=dict(name=u'Can delete document')) + content_type=document_content_type, codename='delete_document', defaults=dict(name='Can delete document')) editors_group = orm['auth.group'].objects.get(name='Editors') editors_group.permissions.add(add_permission, change_permission, delete_permission) @@ -40,17 +42,17 @@ class Migration(DataMigration): moderators_group.permissions.remove(*document_permissions) models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -58,31 +60,31 @@ class Migration(DataMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtaildocs.document': { + 'wagtaildocs.document': { 'Meta': {'object_name': 'Document'}, 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'uploaded_by_user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}) + 'uploaded_by_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}) } } diff --git a/wagtail/wagtailembeds/migrations/0001_initial.py b/wagtail/wagtailembeds/migrations/0001_initial.py index 7f782a3b5..ba5d5bbe0 100644 --- a/wagtail/wagtailembeds/migrations/0001_initial.py +++ b/wagtail/wagtailembeds/migrations/0001_initial.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -13,8 +15,8 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'Embed' - db.create_table(u'wagtailembeds_embed', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailembeds_embed', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('url', self.gf('django.db.models.fields.URLField')(max_length=200)), ('max_width', self.gf('django.db.models.fields.SmallIntegerField') (null=True, blank=True)), @@ -30,24 +32,24 @@ class Migration(SchemaMigration): ('last_updated', self.gf('django.db.models.fields.DateTimeField') (auto_now=True, blank=True)), )) - db.send_create_signal(u'wagtailembeds', ['Embed']) + db.send_create_signal('wagtailembeds', ['Embed']) # Adding unique constraint on 'Embed', fields ['url', 'max_width'] - db.create_unique(u'wagtailembeds_embed', ['url', 'max_width']) + db.create_unique('wagtailembeds_embed', ['url', 'max_width']) def backwards(self, orm): # Removing unique constraint on 'Embed', fields ['url', 'max_width'] - db.delete_unique(u'wagtailembeds_embed', ['url', 'max_width']) + db.delete_unique('wagtailembeds_embed', ['url', 'max_width']) # Deleting model 'Embed' - db.delete_table(u'wagtailembeds_embed') + db.delete_table('wagtailembeds_embed') models = { - u'wagtailembeds.embed': { + 'wagtailembeds.embed': { 'Meta': {'unique_together': "(('url', 'max_width'),)", 'object_name': 'Embed'}, 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), 'html': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), 'max_width': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), 'thumbnail_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), diff --git a/wagtail/wagtailembeds/migrations/0002_auto__add_field_embed_author_name__add_field_embed_provider_name.py b/wagtail/wagtailembeds/migrations/0002_auto__add_field_embed_author_name__add_field_embed_provider_name.py index 7da581d21..dd05de09d 100644 --- a/wagtail/wagtailembeds/migrations/0002_auto__add_field_embed_author_name__add_field_embed_provider_name.py +++ b/wagtail/wagtailembeds/migrations/0002_auto__add_field_embed_author_name__add_field_embed_provider_name.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -9,31 +11,31 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding field 'Embed.author_name' - db.add_column(u'wagtailembeds_embed', 'author_name', + db.add_column('wagtailembeds_embed', 'author_name', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False) # Adding field 'Embed.provider_name' - db.add_column(u'wagtailembeds_embed', 'provider_name', + db.add_column('wagtailembeds_embed', 'provider_name', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False) def backwards(self, orm): # Deleting field 'Embed.author_name' - db.delete_column(u'wagtailembeds_embed', 'author_name') + db.delete_column('wagtailembeds_embed', 'author_name') # Deleting field 'Embed.provider_name' - db.delete_column(u'wagtailembeds_embed', 'provider_name') + db.delete_column('wagtailembeds_embed', 'provider_name') models = { - u'wagtailembeds.embed': { + 'wagtailembeds.embed': { 'Meta': {'unique_together': "(('url', 'max_width'),)", 'object_name': 'Embed'}, 'author_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), 'html': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), 'max_width': ('django.db.models.fields.SmallIntegerField', [], {'null': 'True', 'blank': 'True'}), 'provider_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}), diff --git a/wagtail/wagtailforms/migrations/0001_initial.py b/wagtail/wagtailforms/migrations/0001_initial.py index 80cbdb2b6..5543ff289 100644 --- a/wagtail/wagtailforms/migrations/0001_initial.py +++ b/wagtail/wagtailforms/migrations/0001_initial.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -15,32 +17,32 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'FormSubmission' - db.create_table(u'wagtailforms_formsubmission', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailforms_formsubmission', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('form_data', self.gf('django.db.models.fields.TextField')()), ('page', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['wagtailcore.Page'])), ('submit_time', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), )) - db.send_create_signal(u'wagtailforms', ['FormSubmission']) + db.send_create_signal('wagtailforms', ['FormSubmission']) def backwards(self, orm): # Deleting model 'FormSubmission' - db.delete_table(u'wagtailforms_formsubmission') + db.delete_table('wagtailforms_formsubmission') models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -48,33 +50,33 @@ class Migration(SchemaMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['%s']" % AUTH_USER_MODEL}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['%s']" % AUTH_USER_MODEL}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), @@ -83,11 +85,11 @@ class Migration(SchemaMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailforms.formsubmission': { + 'wagtailforms.formsubmission': { 'Meta': {'object_name': 'FormSubmission'}, 'form_data': ('django.db.models.fields.TextField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wagtailcore.Page']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wagtailcore.Page']"}), 'submit_time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) } } diff --git a/wagtail/wagtailimages/migrations/0001_initial.py b/wagtail/wagtailimages/migrations/0001_initial.py index aebf9c992..d92d2ea6c 100644 --- a/wagtail/wagtailimages/migrations/0001_initial.py +++ b/wagtail/wagtailimages/migrations/0001_initial.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -15,8 +17,8 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'Image' - db.create_table(u'wagtailimages_image', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailimages_image', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), ('file', self.gf('django.db.models.fields.files.ImageField')(max_length=100)), ('width', self.gf('django.db.models.fields.IntegerField')()), @@ -26,19 +28,19 @@ class Migration(SchemaMigration): ('uploaded_by_user', self.gf('django.db.models.fields.related.ForeignKey') (to=orm[AUTH_USER_MODEL], null=True, blank=True)), )) - db.send_create_signal(u'wagtailimages', ['Image']) + db.send_create_signal('wagtailimages', ['Image']) # Adding model 'Filter' - db.create_table(u'wagtailimages_filter', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailimages_filter', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('spec', self.gf('django.db.models.fields.CharField') (max_length=255, db_index=True)), )) - db.send_create_signal(u'wagtailimages', ['Filter']) + db.send_create_signal('wagtailimages', ['Filter']) # Adding model 'Rendition' - db.create_table(u'wagtailimages_rendition', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailimages_rendition', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('filter', self.gf('django.db.models.fields.related.ForeignKey') (related_name='+', to=orm['wagtailimages.Filter'])), ('file', self.gf('django.db.models.fields.files.ImageField')(max_length=100)), @@ -47,36 +49,36 @@ class Migration(SchemaMigration): ('image', self.gf('django.db.models.fields.related.ForeignKey') (related_name='renditions', to=orm['wagtailimages.Image'])), )) - db.send_create_signal(u'wagtailimages', ['Rendition']) + db.send_create_signal('wagtailimages', ['Rendition']) # Adding unique constraint on 'Rendition', fields ['image', 'filter'] - db.create_unique(u'wagtailimages_rendition', ['image_id', 'filter_id']) + db.create_unique('wagtailimages_rendition', ['image_id', 'filter_id']) def backwards(self, orm): # Removing unique constraint on 'Rendition', fields ['image', 'filter'] - db.delete_unique(u'wagtailimages_rendition', ['image_id', 'filter_id']) + db.delete_unique('wagtailimages_rendition', ['image_id', 'filter_id']) # Deleting model 'Image' - db.delete_table(u'wagtailimages_image') + db.delete_table('wagtailimages_image') # Deleting model 'Filter' - db.delete_table(u'wagtailimages_filter') + db.delete_table('wagtailimages_filter') # Deleting model 'Rendition' - db.delete_table(u'wagtailimages_rendition') + db.delete_table('wagtailimages_rendition') models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -84,46 +86,46 @@ class Migration(SchemaMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailimages.filter': { + 'wagtailimages.filter': { 'Meta': {'object_name': 'Filter'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'spec': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}) }, - u'wagtailimages.image': { + 'wagtailimages.image': { 'Meta': {'object_name': 'Image'}, 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'file': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), 'height': ('django.db.models.fields.IntegerField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'uploaded_by_user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}), + 'uploaded_by_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}), 'width': ('django.db.models.fields.IntegerField', [], {}) }, - u'wagtailimages.rendition': { + 'wagtailimages.rendition': { 'Meta': {'unique_together': "(('image', 'filter'),)", 'object_name': 'Rendition'}, 'file': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['wagtailimages.Filter']"}), + 'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['wagtailimages.Filter']"}), 'height': ('django.db.models.fields.IntegerField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'renditions'", 'to': u"orm['wagtailimages.Image']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'renditions'", 'to': "orm['wagtailimages.Image']"}), 'width': ('django.db.models.fields.IntegerField', [], {}) } } diff --git a/wagtail/wagtailimages/migrations/0002_initial_data.py b/wagtail/wagtailimages/migrations/0002_initial_data.py index 82731f93b..32081cd59 100644 --- a/wagtail/wagtailimages/migrations/0002_initial_data.py +++ b/wagtail/wagtailimages/migrations/0002_initial_data.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import DataMigration @@ -16,11 +18,11 @@ class Migration(DataMigration): image_content_type, created = orm['contenttypes.ContentType'].objects.get_or_create( model='image', app_label='wagtailimages', defaults={'name': 'image'}) add_permission, created = orm['auth.permission'].objects.get_or_create( - content_type=image_content_type, codename='add_image', defaults=dict(name=u'Can add image')) + content_type=image_content_type, codename='add_image', defaults=dict(name='Can add image')) change_permission, created = orm['auth.permission'].objects.get_or_create( - content_type=image_content_type, codename='change_image', defaults=dict(name=u'Can change image')) + content_type=image_content_type, codename='change_image', defaults=dict(name='Can change image')) delete_permission, created = orm['auth.permission'].objects.get_or_create( - content_type=image_content_type, codename='delete_image', defaults=dict(name=u'Can delete image')) + content_type=image_content_type, codename='delete_image', defaults=dict(name='Can delete image')) editors_group = orm['auth.group'].objects.get(name='Editors') editors_group.permissions.add(add_permission, change_permission, delete_permission) @@ -40,17 +42,17 @@ class Migration(DataMigration): moderators_group.permissions.remove(*image_permissions) models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -58,46 +60,46 @@ class Migration(DataMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailimages.filter': { + 'wagtailimages.filter': { 'Meta': {'object_name': 'Filter'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'spec': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}) }, - u'wagtailimages.image': { + 'wagtailimages.image': { 'Meta': {'object_name': 'Image'}, 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'file': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), 'height': ('django.db.models.fields.IntegerField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'uploaded_by_user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}), + 'uploaded_by_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % AUTH_USER_MODEL, 'null': 'True', 'blank': 'True'}), 'width': ('django.db.models.fields.IntegerField', [], {}) }, - u'wagtailimages.rendition': { + 'wagtailimages.rendition': { 'Meta': {'unique_together': "(('image', 'filter'),)", 'object_name': 'Rendition'}, 'file': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['wagtailimages.Filter']"}), + 'filter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['wagtailimages.Filter']"}), 'height': ('django.db.models.fields.IntegerField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'image': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'renditions'", 'to': u"orm['wagtailimages.Image']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'renditions'", 'to': "orm['wagtailimages.Image']"}), 'width': ('django.db.models.fields.IntegerField', [], {}) } } diff --git a/wagtail/wagtailredirects/migrations/0001_initial.py b/wagtail/wagtailredirects/migrations/0001_initial.py index 6333e27ca..bf8b5300a 100644 --- a/wagtail/wagtailredirects/migrations/0001_initial.py +++ b/wagtail/wagtailredirects/migrations/0001_initial.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + import datetime from south.db import db from south.v2 import SchemaMigration @@ -13,8 +15,8 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'Redirect' - db.create_table(u'wagtailredirects_redirect', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailredirects_redirect', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('old_path', self.gf('django.db.models.fields.CharField') (unique=True, max_length=255, db_index=True)), ('site', self.gf('django.db.models.fields.related.ForeignKey') @@ -25,26 +27,26 @@ class Migration(SchemaMigration): ('redirect_link', self.gf('django.db.models.fields.URLField') (max_length=200, blank=True)), )) - db.send_create_signal(u'wagtailredirects', ['Redirect']) + db.send_create_signal('wagtailredirects', ['Redirect']) def backwards(self, orm): # Deleting model 'Redirect' - db.delete_table(u'wagtailredirects_redirect') + db.delete_table('wagtailredirects_redirect') models = { - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), @@ -54,35 +56,35 @@ class Migration(SchemaMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailcore.site': { + 'wagtailcore.site': { 'Meta': {'object_name': 'Site'}, 'hostname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), - 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': u"orm['wagtailcore.Page']"}) + 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': "orm['wagtailcore.Page']"}) }, - u'taggit.tag': { + 'taggit.tag': { 'Meta': {'object_name': 'Tag'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'}) }, - u'taggit.taggeditem': { + 'taggit.taggeditem': { 'Meta': {'object_name': 'TaggedItem'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'taggit_taggeditem_tagged_items'", 'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_tagged_items'", 'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), - 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'taggit_taggeditem_items'", 'to': u"orm['taggit.Tag']"}) + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_items'", 'to': "orm['taggit.Tag']"}) }, - u'wagtailredirects.redirect': { + 'wagtailredirects.redirect': { 'Meta': {'object_name': 'Redirect'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_permanent': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'old_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), 'redirect_link': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'redirect_page': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': u"orm['wagtailcore.Page']"}), - 'site': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'redirects'", 'null': 'True', 'to': u"orm['wagtailcore.Site']"}) + 'redirect_page': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['wagtailcore.Page']"}), + 'site': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'redirects'", 'null': 'True', 'to': "orm['wagtailcore.Site']"}) } } diff --git a/wagtail/wagtailsearch/migrations/0001_initial.py b/wagtail/wagtailsearch/migrations/0001_initial.py index 45aa27cd2..debca8fd9 100644 --- a/wagtail/wagtailsearch/migrations/0001_initial.py +++ b/wagtail/wagtailsearch/migrations/0001_initial.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -15,30 +17,30 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'Query' - db.create_table(u'wagtailsearch_query', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailsearch_query', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('query_string', self.gf('django.db.models.fields.CharField') (unique=True, max_length=255)), )) - db.send_create_signal(u'wagtailsearch', ['Query']) + db.send_create_signal('wagtailsearch', ['Query']) # Adding model 'QueryDailyHits' - db.create_table(u'wagtailsearch_querydailyhits', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailsearch_querydailyhits', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('query', self.gf('django.db.models.fields.related.ForeignKey') (related_name='daily_hits', to=orm['wagtailsearch.Query'])), ('date', self.gf('django.db.models.fields.DateField')()), ('hits', self.gf('django.db.models.fields.IntegerField')(default=0)), )) - db.send_create_signal(u'wagtailsearch', ['QueryDailyHits']) + db.send_create_signal('wagtailsearch', ['QueryDailyHits']) # Adding unique constraint on 'QueryDailyHits', fields ['query', # 'date'] - db.create_unique(u'wagtailsearch_querydailyhits', ['query_id', 'date']) + db.create_unique('wagtailsearch_querydailyhits', ['query_id', 'date']) # Adding model 'EditorsPick' - db.create_table(u'wagtailsearch_editorspick', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailsearch_editorspick', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('query', self.gf('django.db.models.fields.related.ForeignKey') (related_name='editors_picks', to=orm['wagtailsearch.Query'])), ('page', self.gf('django.db.models.fields.related.ForeignKey') @@ -47,57 +49,57 @@ class Migration(SchemaMigration): (null=True, blank=True)), ('description', self.gf('django.db.models.fields.TextField')(blank=True)), )) - db.send_create_signal(u'wagtailsearch', ['EditorsPick']) + db.send_create_signal('wagtailsearch', ['EditorsPick']) # Adding model 'SearchTest' - db.create_table(u'wagtailsearch_searchtest', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailsearch_searchtest', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), ('content', self.gf('django.db.models.fields.TextField')()), )) - db.send_create_signal(u'wagtailsearch', ['SearchTest']) + db.send_create_signal('wagtailsearch', ['SearchTest']) # Adding model 'SearchTestChild' - db.create_table(u'wagtailsearch_searchtestchild', ( - (u'searchtest_ptr', self.gf('django.db.models.fields.related.OneToOneField') + db.create_table('wagtailsearch_searchtestchild', ( + ('searchtest_ptr', self.gf('django.db.models.fields.related.OneToOneField') (to=orm[ 'wagtailsearch.SearchTest'], unique=True, primary_key=True)), ('extra_content', self.gf('django.db.models.fields.TextField')()), )) - db.send_create_signal(u'wagtailsearch', ['SearchTestChild']) + db.send_create_signal('wagtailsearch', ['SearchTestChild']) def backwards(self, orm): # Removing unique constraint on 'QueryDailyHits', fields ['query', # 'date'] - db.delete_unique(u'wagtailsearch_querydailyhits', ['query_id', 'date']) + db.delete_unique('wagtailsearch_querydailyhits', ['query_id', 'date']) # Deleting model 'Query' - db.delete_table(u'wagtailsearch_query') + db.delete_table('wagtailsearch_query') # Deleting model 'QueryDailyHits' - db.delete_table(u'wagtailsearch_querydailyhits') + db.delete_table('wagtailsearch_querydailyhits') # Deleting model 'EditorsPick' - db.delete_table(u'wagtailsearch_editorspick') + db.delete_table('wagtailsearch_editorspick') # Deleting model 'SearchTest' - db.delete_table(u'wagtailsearch_searchtest') + db.delete_table('wagtailsearch_searchtest') # Deleting model 'SearchTestChild' - db.delete_table(u'wagtailsearch_searchtestchild') + db.delete_table('wagtailsearch_searchtestchild') models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -105,33 +107,33 @@ class Migration(SchemaMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['%s']" % AUTH_USER_MODEL}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['%s']" % AUTH_USER_MODEL}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), @@ -140,36 +142,36 @@ class Migration(SchemaMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailsearch.editorspick': { + 'wagtailsearch.editorspick': { 'Meta': {'ordering': "('sort_order',)", 'object_name': 'EditorsPick'}, 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wagtailcore.Page']"}), - 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': u"orm['wagtailsearch.Query']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wagtailcore.Page']"}), + 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': "orm['wagtailsearch.Query']"}), 'sort_order': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) }, - u'wagtailsearch.query': { + 'wagtailsearch.query': { 'Meta': {'object_name': 'Query'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'query_string': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) }, - u'wagtailsearch.querydailyhits': { + 'wagtailsearch.querydailyhits': { 'Meta': {'unique_together': "(('query', 'date'),)", 'object_name': 'QueryDailyHits'}, 'date': ('django.db.models.fields.DateField', [], {}), 'hits': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': u"orm['wagtailsearch.Query']"}) + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': "orm['wagtailsearch.Query']"}) }, - u'wagtailsearch.searchtest': { + 'wagtailsearch.searchtest': { 'Meta': {'object_name': 'SearchTest'}, 'content': ('django.db.models.fields.TextField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) }, - u'wagtailsearch.searchtestchild': { - 'Meta': {'object_name': 'SearchTestChild', '_ormbases': [u'wagtailsearch.SearchTest']}, + 'wagtailsearch.searchtestchild': { + 'Meta': {'object_name': 'SearchTestChild', '_ormbases': ['wagtailsearch.SearchTest']}, 'extra_content': ('django.db.models.fields.TextField', [], {}), - u'searchtest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['wagtailsearch.SearchTest']", 'unique': 'True', 'primary_key': 'True'}) + 'searchtest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['wagtailsearch.SearchTest']", 'unique': 'True', 'primary_key': 'True'}) } } diff --git a/wagtail/wagtailsearch/migrations/0002_auto__add_field_searchtest_live.py b/wagtail/wagtailsearch/migrations/0002_auto__add_field_searchtest_live.py index b21c83b8b..15aabc051 100644 --- a/wagtail/wagtailsearch/migrations/0002_auto__add_field_searchtest_live.py +++ b/wagtail/wagtailsearch/migrations/0002_auto__add_field_searchtest_live.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -11,28 +13,28 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding field 'SearchTest.live' - db.add_column(u'wagtailsearch_searchtest', 'live', + db.add_column('wagtailsearch_searchtest', 'live', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False) def backwards(self, orm): # Deleting field 'SearchTest.live' - db.delete_column(u'wagtailsearch_searchtest', 'live') + db.delete_column('wagtailsearch_searchtest', 'live') models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -40,33 +42,33 @@ class Migration(SchemaMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['%s']" % AUTH_USER_MODEL}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['%s']" % AUTH_USER_MODEL}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), @@ -75,37 +77,37 @@ class Migration(SchemaMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailsearch.editorspick': { + 'wagtailsearch.editorspick': { 'Meta': {'ordering': "('sort_order',)", 'object_name': 'EditorsPick'}, 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wagtailcore.Page']"}), - 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': u"orm['wagtailsearch.Query']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wagtailcore.Page']"}), + 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': "orm['wagtailsearch.Query']"}), 'sort_order': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) }, - u'wagtailsearch.query': { + 'wagtailsearch.query': { 'Meta': {'object_name': 'Query'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'query_string': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) }, - u'wagtailsearch.querydailyhits': { + 'wagtailsearch.querydailyhits': { 'Meta': {'unique_together': "(('query', 'date'),)", 'object_name': 'QueryDailyHits'}, 'date': ('django.db.models.fields.DateField', [], {}), 'hits': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': u"orm['wagtailsearch.Query']"}) + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': "orm['wagtailsearch.Query']"}) }, - u'wagtailsearch.searchtest': { + 'wagtailsearch.searchtest': { 'Meta': {'object_name': 'SearchTest'}, 'content': ('django.db.models.fields.TextField', [], {}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) }, - u'wagtailsearch.searchtestchild': { - 'Meta': {'object_name': 'SearchTestChild', '_ormbases': [u'wagtailsearch.SearchTest']}, + 'wagtailsearch.searchtestchild': { + 'Meta': {'object_name': 'SearchTestChild', '_ormbases': ['wagtailsearch.SearchTest']}, 'extra_content': ('django.db.models.fields.TextField', [], {}), - u'searchtest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['wagtailsearch.SearchTest']", 'unique': 'True', 'primary_key': 'True'}) + 'searchtest_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['wagtailsearch.SearchTest']", 'unique': 'True', 'primary_key': 'True'}) } } diff --git a/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py b/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py index 9f975009d..239efa5f3 100644 --- a/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py +++ b/wagtail/wagtailusers/migrations/0002_add_user_profile_model.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -11,33 +13,33 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding model 'UserProfile' - db.create_table(u'wagtailusers_userprofile', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + db.create_table('wagtailusers_userprofile', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[AUTH_USER_MODEL], unique=True)), ('submitted_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)), ('rejected_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)), ('approved_notifications', self.gf('django.db.models.fields.BooleanField')(default=True)), )) - db.send_create_signal(u'wagtailusers', ['UserProfile']) + db.send_create_signal('wagtailusers', ['UserProfile']) def backwards(self, orm): # Deleting model 'UserProfile' - db.delete_table(u'wagtailusers_userprofile') + db.delete_table('wagtailusers_userprofile') models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, AUTH_USER_MODEL: { @@ -45,31 +47,31 @@ class Migration(SchemaMigration): 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailusers.userprofile': { + 'wagtailusers.userprofile': { 'Meta': {'object_name': 'UserProfile'}, 'approved_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'rejected_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'submitted_notifications': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['%s']" % AUTH_USER_MODEL, 'unique': 'True'}) + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['%s']" % AUTH_USER_MODEL, 'unique': 'True'}) } } From 9755ece5ccb8a4cd94e74e7845863aa48d290684 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 21:45:38 +0100 Subject: [PATCH 131/298] Added python 3.2 to tox settings --- tox.ini | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tox.ini b/tox.ini index c67a219b4..8ffd0ef60 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ envlist = py26-dj16-sqlite, py27-dj16-postgres, py27-dj16-sqlite, + py32-dj16-postgres, py33-dj16-postgres, py34-dj16-postgres @@ -75,6 +76,21 @@ setenv = DATABASE_ENGINE=django.db.backends.mysql DATABASE_USER=wagtail +[testenv:py32-dj16-postgres] +basepython=python3.2 +deps = + {[deps]dj16} + psycopg2==2.5.3 +setenv = + DATABASE_ENGINE=django.db.backends.postgresql_psycopg2 + +[testenv:py32-dj16-sqlite] +basepython=python3.2 +deps = + {[deps]dj16} +setenv = + DATABASE_ENGINE=django.db.backends.sqlite3 + [testenv:py33-dj16-postgres] basepython=python3.3 deps = From e42029328f9a80dd2de839078aabe1a251625bc7 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 21:46:37 +0100 Subject: [PATCH 132/298] Added python 3.2 support to readme --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 2866e6c8a..3ca45da1b 100644 --- a/README.rst +++ b/README.rst @@ -44,7 +44,7 @@ Available at `wagtail.readthedocs.org `_ and al Compatibility ~~~~~~~~~~~~~ -Wagtail supports Django 1.6.2+ on Python 2.6, 2.7, 3.3 and 3.4. +Wagtail supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 support is in progress pending further release candidate testing. From b45b1d5404b472c1bcff5d451bfa9ff4114168a7 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 2 Jul 2014 21:56:50 +0100 Subject: [PATCH 133/298] remove a load of unused imports --- wagtail/contrib/wagtailsitemaps/tests.py | 1 - wagtail/contrib/wagtailsitemaps/views.py | 1 - wagtail/contrib/wagtailstyleguide/views.py | 6 ------ wagtail/contrib/wagtailstyleguide/wagtail_hooks.py | 6 +----- wagtail/tests/utils.py | 3 --- wagtail/wagtailadmin/edit_handlers.py | 7 +------ wagtail/wagtailadmin/tests/test_account_management.py | 2 +- wagtail/wagtailadmin/tests/test_pages_views.py | 4 ++-- wagtail/wagtailadmin/tests/tests.py | 3 +-- wagtail/wagtailadmin/urls.py | 3 +-- wagtail/wagtailadmin/userbar.py | 1 - wagtail/wagtailcore/compat.py | 1 + .../management/commands/publish_scheduled_pages.py | 1 - wagtail/wagtailcore/models.py | 1 - wagtail/wagtailcore/tests/test_management_commands.py | 8 +++----- wagtail/wagtailcore/tests/test_page_model.py | 6 +----- wagtail/wagtailcore/tests/test_page_permissions.py | 10 +++------- wagtail/wagtailcore/tests/test_page_queryset.py | 11 +++-------- wagtail/wagtailcore/tests/test_whitelist.py | 2 +- wagtail/wagtailembeds/tests.py | 1 - wagtail/wagtailembeds/views/chooser.py | 1 - wagtail/wagtailsearch/backends/elasticsearch.py | 1 - wagtail/wagtailsearch/tests/test_editorspicks.py | 2 +- wagtail/wagtailsearch/tests/test_queries.py | 2 +- wagtail/wagtailsnippets/tests.py | 3 +-- 25 files changed, 22 insertions(+), 65 deletions(-) diff --git a/wagtail/contrib/wagtailsitemaps/tests.py b/wagtail/contrib/wagtailsitemaps/tests.py index fd639e4ec..d2d612fa2 100644 --- a/wagtail/contrib/wagtailsitemaps/tests.py +++ b/wagtail/contrib/wagtailsitemaps/tests.py @@ -1,5 +1,4 @@ from django.test import TestCase -from django.core.urlresolvers import reverse from django.core.cache import cache from wagtail.wagtailcore.models import Page, Site diff --git a/wagtail/contrib/wagtailsitemaps/views.py b/wagtail/contrib/wagtailsitemaps/views.py index 4ef02de0b..04f31fdae 100644 --- a/wagtail/contrib/wagtailsitemaps/views.py +++ b/wagtail/contrib/wagtailsitemaps/views.py @@ -1,4 +1,3 @@ -from django.shortcuts import render from django.http import HttpResponse from django.core.cache import cache from django.conf import settings diff --git a/wagtail/contrib/wagtailstyleguide/views.py b/wagtail/contrib/wagtailstyleguide/views.py index 9c830073c..9683289d2 100644 --- a/wagtail/contrib/wagtailstyleguide/views.py +++ b/wagtail/contrib/wagtailstyleguide/views.py @@ -1,16 +1,10 @@ from django import forms -from django.db import models from django.shortcuts import render from django.utils.translation import ugettext as _ from django.contrib import messages from django.contrib.auth.decorators import permission_required -from wagtail.wagtailadmin.edit_handlers import PageChooserPanel -from wagtail.wagtailimages.edit_handlers import ImageChooserPanel -from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel - from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailcore.fields import RichTextField CHOICES = ( diff --git a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py index ae2989be9..5782ee736 100644 --- a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py +++ b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py @@ -1,14 +1,10 @@ -from django.conf import settings -from django.conf.urls import include, url +from django.conf.urls import url from django.core import urlresolvers -from django.utils.html import format_html, format_html_join from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin import hooks from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailimages import urls - from . import views diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py index 02327799b..c44549401 100644 --- a/wagtail/tests/utils.py +++ b/wagtail/tests/utils.py @@ -1,7 +1,4 @@ -from django.test import TestCase from django.contrib.auth.models import User -from django.utils.six.moves.urllib.parse import urlparse, ParseResult -from django.http import QueryDict # We need to make sure that we're using the same unittest library that Django uses internally # Otherwise, we get issues with the "SkipTest" and "ExpectedFailure" exceptions being recognised as errors diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 638072fa8..e6ead286d 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -1,6 +1,4 @@ import copy -import re -import datetime from six import string_types from six import text_type @@ -12,13 +10,10 @@ from django.template.loader import render_to_string from django.template.defaultfilters import addslashes from django.utils.safestring import mark_safe from django import forms -from django.db import models from django.forms.models import fields_for_model from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured, ValidationError +from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.urlresolvers import reverse -from django.conf import settings -from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy from wagtail.wagtailcore.models import Page diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py index 7128f8885..09b493de9 100644 --- a/wagtail/wagtailadmin/tests/test_account_management.py +++ b/wagtail/wagtailadmin/tests/test_account_management.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import User, Group, Permission from django.contrib.auth.tokens import PasswordResetTokenGenerator from django.core import mail -from wagtail.tests.utils import unittest, WagtailTestUtils +from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailusers.models import UserProfile diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 2e54218bf..9e95e50b1 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -7,8 +7,8 @@ from django.core import mail from django.core.paginator import Paginator from django.utils import timezone -from wagtail.tests.models import SimplePage, EventPage, StandardIndex, StandardChild, BusinessIndex, BusinessChild, BusinessSubIndex -from wagtail.tests.utils import unittest, WagtailTestUtils +from wagtail.tests.models import SimplePage, EventPage, StandardIndex, BusinessIndex, BusinessChild, BusinessSubIndex +from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailcore.models import Page, PageRevision from wagtail.wagtailcore.signals import page_published from wagtail.wagtailusers.models import UserProfile diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/wagtailadmin/tests/tests.py index f014c026d..4d5491f1d 100644 --- a/wagtail/wagtailadmin/tests/tests.py +++ b/wagtail/wagtailadmin/tests/tests.py @@ -1,6 +1,5 @@ from django.test import TestCase -from wagtail.tests.models import SimplePage, EventPage -from wagtail.tests.utils import unittest, WagtailTestUtils +from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailcore.models import Page from wagtail.wagtailadmin.tasks import send_email_task from django.core.urlresolvers import reverse diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py index 35bb63d5e..1487eacb6 100644 --- a/wagtail/wagtailadmin/urls.py +++ b/wagtail/wagtailadmin/urls.py @@ -1,7 +1,6 @@ from django.conf.urls import url -from django.conf import settings -from wagtail.wagtailadmin.forms import LoginForm, PasswordResetForm +from wagtail.wagtailadmin.forms import PasswordResetForm from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar from wagtail.wagtailadmin import hooks diff --git a/wagtail/wagtailadmin/userbar.py b/wagtail/wagtailadmin/userbar.py index a641a7b1d..195e936b3 100644 --- a/wagtail/wagtailadmin/userbar.py +++ b/wagtail/wagtailadmin/userbar.py @@ -1,4 +1,3 @@ -from django.core.urlresolvers import reverse from django.template import RequestContext from django.template.loader import render_to_string diff --git a/wagtail/wagtailcore/compat.py b/wagtail/wagtailcore/compat.py index 71fbc39ac..54133e6e9 100644 --- a/wagtail/wagtailcore/compat.py +++ b/wagtail/wagtailcore/compat.py @@ -1,4 +1,5 @@ from django.conf import settings +from django.core.exceptions import ImproperlyConfigured # A setting that can be used in foreign key declarations AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User') diff --git a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py index cb0d4cab8..9a69f5f2e 100644 --- a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py +++ b/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py @@ -1,6 +1,5 @@ from __future__ import print_function -import datetime import json from optparse import make_option diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 29cadff56..7f3070615 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -18,7 +18,6 @@ from django.contrib.auth.models import Group from django.conf import settings from django.template.response import TemplateResponse from django.utils import timezone -from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import ValidationError from django.utils.functional import cached_property diff --git a/wagtail/wagtailcore/tests/test_management_commands.py b/wagtail/wagtailcore/tests/test_management_commands.py index 1e3ff28e1..ad1aa33aa 100644 --- a/wagtail/wagtailcore/tests/test_management_commands.py +++ b/wagtail/wagtailcore/tests/test_management_commands.py @@ -2,14 +2,12 @@ from datetime import timedelta from six import StringIO -from django.test import TestCase, Client -from django.http import HttpRequest, Http404 +from django.test import TestCase from django.core import management -from django.contrib.auth.models import User from django.utils import timezone -from wagtail.wagtailcore.models import Page, PageRevision, Site, UserPagePermissionsProxy -from wagtail.tests.models import EventPage, EventIndex, SimplePage +from wagtail.wagtailcore.models import Page, PageRevision +from wagtail.tests.models import SimplePage class TestFixTreeCommand(TestCase): diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 58c359d72..2a257c743 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -1,11 +1,7 @@ -from six import StringIO - from django.test import TestCase, Client from django.http import HttpRequest, Http404 -from django.core import management -from django.contrib.auth.models import User -from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy +from wagtail.wagtailcore.models import Page, Site from wagtail.tests.models import EventPage, EventIndex, SimplePage diff --git a/wagtail/wagtailcore/tests/test_page_permissions.py b/wagtail/wagtailcore/tests/test_page_permissions.py index eb2fe3257..be4797d3d 100644 --- a/wagtail/wagtailcore/tests/test_page_permissions.py +++ b/wagtail/wagtailcore/tests/test_page_permissions.py @@ -1,12 +1,8 @@ -from six import StringIO - -from django.test import TestCase, Client -from django.http import HttpRequest, Http404 -from django.core import management +from django.test import TestCase from django.contrib.auth.models import User -from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy -from wagtail.tests.models import EventPage, EventIndex, SimplePage +from wagtail.wagtailcore.models import Page, UserPagePermissionsProxy +from wagtail.tests.models import EventPage class TestPagePermission(TestCase): diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/wagtailcore/tests/test_page_queryset.py index 2c4e46c9c..bc07f0fba 100644 --- a/wagtail/wagtailcore/tests/test_page_queryset.py +++ b/wagtail/wagtailcore/tests/test_page_queryset.py @@ -1,12 +1,7 @@ -from six import StringIO +from django.test import TestCase -from django.test import TestCase, Client -from django.http import HttpRequest, Http404 -from django.core import management -from django.contrib.auth.models import User - -from wagtail.wagtailcore.models import Page, Site, UserPagePermissionsProxy -from wagtail.tests.models import EventPage, EventIndex, SimplePage +from wagtail.wagtailcore.models import Page +from wagtail.tests.models import EventPage class TestPageQuerySet(TestCase): diff --git a/wagtail/wagtailcore/tests/test_whitelist.py b/wagtail/wagtailcore/tests/test_whitelist.py index 28b63d9fb..d96100382 100644 --- a/wagtail/wagtailcore/tests/test_whitelist.py +++ b/wagtail/wagtailcore/tests/test_whitelist.py @@ -1,4 +1,4 @@ -from bs4 import BeautifulSoup, NavigableString +from bs4 import BeautifulSoup from django.test import TestCase from wagtail.wagtailcore.whitelist import ( diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py index ea49ccdb5..73f6a7f4b 100644 --- a/wagtail/wagtailembeds/tests.py +++ b/wagtail/wagtailembeds/tests.py @@ -1,4 +1,3 @@ -from six.moves.urllib.request import urlopen import six.moves.urllib.request from six.moves.urllib.error import URLError diff --git a/wagtail/wagtailembeds/views/chooser.py b/wagtail/wagtailembeds/views/chooser.py index b364d83b7..5892ed91b 100644 --- a/wagtail/wagtailembeds/views/chooser.py +++ b/wagtail/wagtailembeds/views/chooser.py @@ -1,5 +1,4 @@ from django.forms.util import ErrorList -from django.conf import settings from django.utils.translation import ugettext as _ from wagtail.wagtailadmin.modal_workflow import render_modal_workflow diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index e4d716ea1..91536d744 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -1,7 +1,6 @@ from __future__ import absolute_import import json -import warnings from django.db import models diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py index 99debab40..b2ebece9f 100644 --- a/wagtail/wagtailsearch/tests/test_editorspicks.py +++ b/wagtail/wagtailsearch/tests/test_editorspicks.py @@ -1,7 +1,7 @@ from django.test import TestCase from django.core.urlresolvers import reverse -from wagtail.tests.utils import unittest, WagtailTestUtils +from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailsearch import models diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py index 10785187e..d4d2797df 100644 --- a/wagtail/wagtailsearch/tests/test_queries.py +++ b/wagtail/wagtailsearch/tests/test_queries.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.core import management from wagtail.wagtailsearch import models -from wagtail.tests.utils import unittest, WagtailTestUtils +from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailsearch.utils import normalise_query_string diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 1b1e012de..56b3f8b6a 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -1,8 +1,7 @@ from django.test import TestCase from django.core.urlresolvers import reverse -from django.contrib.auth.models import User -from wagtail.tests.utils import unittest, WagtailTestUtils +from wagtail.tests.utils import WagtailTestUtils from wagtail.tests.models import Advert, AlphaSnippet, ZuluSnippet from wagtail.wagtailsnippets.models import register_snippet, SNIPPET_MODELS From f758808a2166d78d1107ea2802cd04741732e602 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 22:02:07 +0100 Subject: [PATCH 134/298] Added python 3.2 to travis settings --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 48c8494b7..326c22d01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: python # Test matrix python: - 2.7 + - 3.2 - 3.4 env: - DJANGO_VERSION=Django==1.6.5 From 81f427d80157116e6665bfa2f4a174a1e3ca9223 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 22:15:48 +0100 Subject: [PATCH 135/298] Make sure names of edit handler types are bytestrings and not unicode --- wagtail/wagtailadmin/edit_handlers.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 35dad33da..1e96d47e4 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -113,7 +113,7 @@ def get_form_for_model( # Give this new form class a reasonable name. class_name = model.__name__ + str('Form') form_class_attrs = { - 'Meta': type('Meta', (object,), attrs) + 'Meta': type(b'Meta', (object,), attrs) } return WagtailAdminModelFormMetaclass(class_name, (WagtailAdminModelForm,), form_class_attrs) @@ -324,7 +324,7 @@ class BaseTabbedInterface(BaseCompositeEditHandler): def TabbedInterface(children): - return type('_TabbedInterface', (BaseTabbedInterface,), {'children': children}) + return type(b'_TabbedInterface', (BaseTabbedInterface,), {'children': children}) class BaseObjectList(BaseCompositeEditHandler): @@ -332,7 +332,7 @@ class BaseObjectList(BaseCompositeEditHandler): def ObjectList(children, heading="", classname=""): - return type('_ObjectList', (BaseObjectList,), { + return type(b'_ObjectList', (BaseObjectList,), { 'children': children, 'heading': heading, 'classname': classname @@ -343,7 +343,7 @@ class BaseFieldRowPanel(BaseCompositeEditHandler): template = "wagtailadmin/edit_handlers/field_row_panel.html" def FieldRowPanel(children, classname=""): - return type('_FieldRowPanel', (BaseFieldRowPanel,), { + return type(b'_FieldRowPanel', (BaseFieldRowPanel,), { 'children': children, 'classname': classname, }) @@ -358,7 +358,7 @@ class BaseMultiFieldPanel(BaseCompositeEditHandler): return classes def MultiFieldPanel(children, heading="", classname=""): - return type('_MultiFieldPanel', (BaseMultiFieldPanel,), { + return type(b'_MultiFieldPanel', (BaseMultiFieldPanel,), { 'children': children, 'heading': heading, 'classname': classname, @@ -420,7 +420,7 @@ class BaseFieldPanel(EditHandler): def FieldPanel(field_name, classname=""): - return type('_FieldPanel', (BaseFieldPanel,), { + return type(b'_FieldPanel', (BaseFieldPanel,), { 'field_name': field_name, 'classname': classname, }) @@ -432,7 +432,7 @@ class BaseRichTextFieldPanel(BaseFieldPanel): def RichTextFieldPanel(field_name): - return type('_RichTextFieldPanel', (BaseRichTextFieldPanel,), { + return type(b'_RichTextFieldPanel', (BaseRichTextFieldPanel,), { 'field_name': field_name, }) @@ -523,7 +523,7 @@ class BasePageChooserPanel(BaseChooserPanel): def PageChooserPanel(field_name, page_type=None): - return type('_PageChooserPanel', (BasePageChooserPanel,), { + return type(b'_PageChooserPanel', (BasePageChooserPanel,), { 'field_name': field_name, 'page_type': page_type, }) @@ -606,7 +606,7 @@ class BaseInlinePanel(EditHandler): def InlinePanel(base_model, relation_name, panels=None, label='', help_text=''): rel = getattr(base_model, relation_name).related - return type('_InlinePanel', (BaseInlinePanel,), { + return type(b'_InlinePanel', (BaseInlinePanel,), { 'relation_name': relation_name, 'related': rel, 'panels': panels, From c743b71a031dae822d1c51ee3e8eeddf500644a6 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 22:26:30 +0100 Subject: [PATCH 136/298] Cast edit handler type names to str before passing into type() On python 2, these need to be bytestrings and on python 3 they need to be unicode. So casting to str is a good fit. --- wagtail/wagtailadmin/edit_handlers.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 1e96d47e4..f57aabf69 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -113,7 +113,7 @@ def get_form_for_model( # Give this new form class a reasonable name. class_name = model.__name__ + str('Form') form_class_attrs = { - 'Meta': type(b'Meta', (object,), attrs) + 'Meta': type(str('Meta'), (object,), attrs) } return WagtailAdminModelFormMetaclass(class_name, (WagtailAdminModelForm,), form_class_attrs) @@ -324,7 +324,7 @@ class BaseTabbedInterface(BaseCompositeEditHandler): def TabbedInterface(children): - return type(b'_TabbedInterface', (BaseTabbedInterface,), {'children': children}) + return type(str('_TabbedInterface'), (BaseTabbedInterface,), {'children': children}) class BaseObjectList(BaseCompositeEditHandler): @@ -332,7 +332,7 @@ class BaseObjectList(BaseCompositeEditHandler): def ObjectList(children, heading="", classname=""): - return type(b'_ObjectList', (BaseObjectList,), { + return type(str('_ObjectList'), (BaseObjectList,), { 'children': children, 'heading': heading, 'classname': classname @@ -343,7 +343,7 @@ class BaseFieldRowPanel(BaseCompositeEditHandler): template = "wagtailadmin/edit_handlers/field_row_panel.html" def FieldRowPanel(children, classname=""): - return type(b'_FieldRowPanel', (BaseFieldRowPanel,), { + return type(str('_FieldRowPanel'), (BaseFieldRowPanel,), { 'children': children, 'classname': classname, }) @@ -358,7 +358,7 @@ class BaseMultiFieldPanel(BaseCompositeEditHandler): return classes def MultiFieldPanel(children, heading="", classname=""): - return type(b'_MultiFieldPanel', (BaseMultiFieldPanel,), { + return type(str('_MultiFieldPanel'), (BaseMultiFieldPanel,), { 'children': children, 'heading': heading, 'classname': classname, @@ -420,7 +420,7 @@ class BaseFieldPanel(EditHandler): def FieldPanel(field_name, classname=""): - return type(b'_FieldPanel', (BaseFieldPanel,), { + return type(str('_FieldPanel'), (BaseFieldPanel,), { 'field_name': field_name, 'classname': classname, }) @@ -432,7 +432,7 @@ class BaseRichTextFieldPanel(BaseFieldPanel): def RichTextFieldPanel(field_name): - return type(b'_RichTextFieldPanel', (BaseRichTextFieldPanel,), { + return type(str('_RichTextFieldPanel'), (BaseRichTextFieldPanel,), { 'field_name': field_name, }) @@ -523,7 +523,7 @@ class BasePageChooserPanel(BaseChooserPanel): def PageChooserPanel(field_name, page_type=None): - return type(b'_PageChooserPanel', (BasePageChooserPanel,), { + return type(str('_PageChooserPanel'), (BasePageChooserPanel,), { 'field_name': field_name, 'page_type': page_type, }) @@ -606,7 +606,7 @@ class BaseInlinePanel(EditHandler): def InlinePanel(base_model, relation_name, panels=None, label='', help_text=''): rel = getattr(base_model, relation_name).related - return type(b'_InlinePanel', (BaseInlinePanel,), { + return type(str('_InlinePanel'), (BaseInlinePanel,), { 'relation_name': relation_name, 'related': rel, 'panels': panels, From 6800869153863704abef88f205e5065cfe00650d Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 2 Jul 2014 22:37:08 +0100 Subject: [PATCH 137/298] Ditto for WagtailAdminModelForm class --- wagtail/wagtailadmin/edit_handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index f57aabf69..f97160151 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -77,7 +77,7 @@ class WagtailAdminModelFormMetaclass(ClusterFormMetaclass): new_class = super(WagtailAdminModelFormMetaclass, cls).__new__(cls, name, bases, attrs) return new_class -WagtailAdminModelForm = WagtailAdminModelFormMetaclass('WagtailAdminModelForm', (ClusterForm,), {}) +WagtailAdminModelForm = WagtailAdminModelFormMetaclass(str('WagtailAdminModelForm'), (ClusterForm,), {}) # Now, any model forms built off WagtailAdminModelForm instead of ModelForm should pick up # the nice form fields defined in FORM_FIELD_OVERRIDES. From 1ce157ea432a32c737e2ad47e2b337bb699da61c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 09:17:55 +0100 Subject: [PATCH 138/298] Added purge_url_from cache to wagtailfontendcache.utils --- wagtail/contrib/wagtailfrontendcache/utils.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/wagtail/contrib/wagtailfrontendcache/utils.py b/wagtail/contrib/wagtailfrontendcache/utils.py index b95ed7e95..66b77c971 100644 --- a/wagtail/contrib/wagtailfrontendcache/utils.py +++ b/wagtail/contrib/wagtailfrontendcache/utils.py @@ -24,12 +24,17 @@ class CustomHTTPAdapter(HTTPAdapter): return super(CustomHTTPAdapter, self).get_connection(self.cache_url, proxies) -def purge_page_from_cache(page): +def purge_url_from_cache(url): # Get session cache_server_url = getattr(settings, 'WAGTAILFRONTENDCACHE_LOCATION', 'http://127.0.0.1:8000/') session = requests.Session() session.mount('http://', CustomHTTPAdapter(cache_server_url)) - # Purge paths from cache - for path in page.get_cached_paths(): - session.request('PURGE', page.full_url + path[1:]) + # Send purge request to cache + session.request('PURGE', url) + + +def purge_page_from_cache(page): + # Purge cached paths from cache + for path in page.specific.get_cached_paths(): + purge_url_from_cache(page.full_url + path[1:]) From 09cdc99ff21d794a16034ec7f9f7679efafabfca Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 3 Jul 2014 10:14:01 +0100 Subject: [PATCH 139/298] Addressing issue where ordering of new inlinepanel items created two items of the same order --- wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js index 4f76ce8a2..a5dd67eeb 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js @@ -247,7 +247,10 @@ function InlinePanel(opts) { } self.initChildControls(fixPrefix(opts.emptyChildFormPrefix)); if (opts.canOrder) { - $(fixPrefix('#id_' + opts.emptyChildFormPrefix + '-ORDER')).val(formCount); + /* NB form hidden inputs use 0-based index and only increment formCount *after* this function is run. + Therefore formcount and order are currently equal and order must be incremented + to ensure it's *greater* than previous item */ + $(fixPrefix('#id_' + opts.emptyChildFormPrefix + '-ORDER')).val(formCount + 1); } self.updateMoveButtonDisabledStates(); From e4a9756c7942411c95588501427954fdf90f5814 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 10:14:51 +0100 Subject: [PATCH 140/298] Added little section in the docs describing purge_url_from_cache --- docs/frontend_cache_purging.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/frontend_cache_purging.rst b/docs/frontend_cache_purging.rst index a949bdc6e..e8564f6c1 100644 --- a/docs/frontend_cache_purging.rst +++ b/docs/frontend_cache_purging.rst @@ -100,3 +100,16 @@ Let's take the the above BlogIndexPage as an example. We need to register a sign @register(pre_delete, sender=BlogPage) def blog_deleted_handler(instance): blog_page_changed(instance) + + +Purging individual URLs +----------------------- + +``wagtail.contrib.wagtailfrontendcache.utils`` provides another utils function called ``purge_url_from_cache``. As the name suggests, this purges an individual URL from the cache. + +.. code-block:: python + + from wagtail.contrib.wagtailfrontendcache.utils import purge_url_from_cache + + # Purge the homepage + purge_url_from_cache(homepage.full_url) From 1a3558cabd2751a975fcabd11979874ba17a54ee Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 10:25:26 +0100 Subject: [PATCH 141/298] Added DeprecationWarning to wagtailadmin.hooks --- wagtail/wagtailadmin/hooks.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wagtail/wagtailadmin/hooks.py b/wagtail/wagtailadmin/hooks.py index 75c3a8991..989c43bd8 100644 --- a/wagtail/wagtailadmin/hooks.py +++ b/wagtail/wagtailadmin/hooks.py @@ -1,4 +1,11 @@ # The 'hooks' module is now part of wagtailcore. # Imports are provided here for backwards compatibility +import warnings + +warnings.warn( + "The wagtail.wagtailadmin.hooks module has been moved. " + "Use wagtail.wagtailcore.hooks instead.", DeprecationWarning) + + from wagtail.wagtailcore.hooks import register, get_hooks From bba9d4faf29c7a8b84e557223174f6930f0cc378 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 12:41:51 +0100 Subject: [PATCH 142/298] Added new search configuration format --- wagtail/wagtailadmin/taggable.py | 21 ++++------- wagtail/wagtailcore/models.py | 25 +++++-------- wagtail/wagtaildocs/models.py | 12 +++---- wagtail/wagtailimages/models.py | 12 +++---- wagtail/wagtailsearch/indexed.py | 60 ++++++++++++++++++++++++++++++++ wagtail/wagtailsearch/models.py | 15 +++++--- 6 files changed, 94 insertions(+), 51 deletions(-) diff --git a/wagtail/wagtailadmin/taggable.py b/wagtail/wagtailadmin/taggable.py index 39213e956..91c36ca7f 100644 --- a/wagtail/wagtailadmin/taggable.py +++ b/wagtail/wagtailadmin/taggable.py @@ -4,27 +4,20 @@ from django.contrib.contenttypes.models import ContentType from django.db.models import Count from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from wagtail.wagtailsearch import Indexed, get_search_backend +from wagtail.wagtailsearch import indexed +from wagtail.wagtailsearch.backends import get_search_backend -class TagSearchable(Indexed): +class TagSearchable(indexed.Indexed): """ Mixin to provide a 'search' method, searching on the 'title' field and tags, for models that provide those things. """ - indexed_fields = { - 'title': { - 'type': 'string', - 'analyzer': 'edgengram_analyzer', - 'boost': 10, - }, - 'get_tags': { - 'type': 'string', - 'analyzer': 'edgengram_analyzer', - 'boost': 10, - }, - } + search_fields = ( + indexed.SearchField('title', partial_match=True, boost=10), + indexed.SearchField('get_tags', partial_match=True, boost=10) + ) @property def get_tags(self): diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 7f3070615..4964966a3 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -28,7 +28,8 @@ from treebeard.mp_tree import MP_Node from wagtail.wagtailcore.utils import camelcase_to_underscore from wagtail.wagtailcore.query import PageQuerySet -from wagtail.wagtailsearch import Indexed, get_search_backend +from wagtail.wagtailsearch import indexed +from wagtail.wagtailsearch.backends import get_search_backend class SiteManager(models.Manager): @@ -260,7 +261,7 @@ class PageBase(models.base.ModelBase): @python_2_unicode_compatible -class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): +class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, indexed.Indexed)): title = models.CharField(max_length=255, help_text=_("The page title as you'd like it to be seen by the public")) slug = models.SlugField(help_text=_("The name of the page as it will appear in URLs e.g http://domain.com/blog/[my-slug]/")) # TODO: enforce uniqueness on slug field per parent (will have to be done at the Django @@ -279,21 +280,11 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): expire_at = models.DateTimeField(verbose_name=_("Expiry date/time"), help_text=_("Please add a date-time in the form YYYY-MM-DD hh:mm."), blank=True, null=True) expired = models.BooleanField(default=False, editable=False) - indexed_fields = { - 'title': { - 'type': 'string', - 'analyzer': 'edgengram_analyzer', - 'boost': 100, - }, - 'live': { - 'type': 'boolean', - 'index': 'not_analyzed', - }, - 'path': { - 'type': 'string', - 'index': 'not_analyzed', - }, - } + search_fields = ( + indexed.SearchField('title', partial_match=True, boost=100), + indexed.FilterField('live'), + indexed.FilterField('path'), + ) def __init__(self, *args, **kwargs): super(Page, self).__init__(*args, **kwargs) diff --git a/wagtail/wagtaildocs/models.py b/wagtail/wagtaildocs/models.py index a87b9c02b..513c0ede0 100644 --- a/wagtail/wagtaildocs/models.py +++ b/wagtail/wagtaildocs/models.py @@ -12,6 +12,7 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import python_2_unicode_compatible from wagtail.wagtailadmin.taggable import TagSearchable +from wagtail.wagtailsearch import indexed @python_2_unicode_compatible @@ -23,14 +24,9 @@ class Document(models.Model, TagSearchable): tags = TaggableManager(help_text=None, blank=True, verbose_name=_('Tags')) - indexed_fields = { - 'uploaded_by_user_id': { - 'type': 'integer', - 'store': 'yes', - 'indexed': 'no', - 'boost': 0, - }, - } + search_fields = TagSearchable.search_fields + ( + indexed.FilterField('uploaded_by_user'), + ) def __str__(self): return self.title diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index db73b048a..c561cdcc5 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -20,6 +20,7 @@ from unidecode import unidecode from wagtail.wagtailadmin.taggable import TagSearchable from wagtail.wagtailimages.backends import get_image_backend +from wagtail.wagtailsearch import indexed from .utils import validate_image_format @@ -48,14 +49,9 @@ class AbstractImage(models.Model, TagSearchable): tags = TaggableManager(help_text=None, blank=True, verbose_name=_('Tags')) - indexed_fields = { - 'uploaded_by_user_id': { - 'type': 'integer', - 'store': 'yes', - 'indexed': 'no', - 'boost': 0, - }, - } + search_fields = TagSearchable.search_fields + ( + indexed.FilterField('uploaded_by_user'), + ) def __str__(self): return self.title diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index b53481727..e2817905d 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -35,6 +35,11 @@ class Indexed(object): @classmethod def indexed_get_indexed_fields(cls): + # New way + if hasattr(cls, 'search_fields'): + return dict((field.get_attname(cls), field.to_dict(cls)) for field in cls.search_fields) + + # Old way # Get indexed fields for this class as dictionary indexed_fields = cls.indexed_fields if isinstance(indexed_fields, dict): @@ -83,3 +88,58 @@ class Indexed(object): return doc indexed_fields = () + + +class BaseField(object): + def __init__(self, field_name, **kwargs): + self.field_name = field_name + self.kwargs = kwargs + + def get_field(self, cls): + return cls._meta.get_field_by_name(self.field_name)[0] + + def get_attname(self, cls): + try: + field = self.get_field(cls) + return field.attname + except models.fields.FieldDoesNotExist: + return self.field_name + + def to_dict(self, cls): + dic = { + 'type': 'string' + } + + if 'es_extra' in self.kwargs: + for key, value in self.kwargs['es_extra'].items(): + dic[key] = value + + return dic + + +class SearchField(BaseField): + def __init__(self, field_name, boost=None, partial_match=False, **kwargs): + super(SearchField, self).__init__(field_name, **kwargs) + self.boost = boost + self.partial_match = partial_match + + def to_dict(self, cls): + dic = super(SearchField, self).to_dict(cls) + + if self.boost and 'boost' not in dic: + dic['boost'] = self.boost + + if self.partial_match and 'analyzer' not in dic: + dic['analyzer'] = 'edgengram_analyzer' + + return dic + + +class FilterField(BaseField): + def to_dict(self, cls): + dic = super(FilterField, self).to_dict(cls) + + if 'index' not in dic: + dic['index'] = 'not_analyzed' + + return dic diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py index abb479295..509368463 100644 --- a/wagtail/wagtailsearch/models.py +++ b/wagtail/wagtailsearch/models.py @@ -4,7 +4,7 @@ from django.db import models from django.utils import timezone from django.utils.encoding import python_2_unicode_compatible -from wagtail.wagtailsearch.indexed import Indexed +from wagtail.wagtailsearch import indexed from wagtail.wagtailsearch.utils import normalise_query_string, MAX_QUERY_STRING_LENGTH @@ -82,12 +82,17 @@ class EditorsPick(models.Model): # Used for tests -class SearchTest(models.Model, Indexed): +class SearchTest(models.Model, indexed.Indexed): title = models.CharField(max_length=255) content = models.TextField() live = models.BooleanField(default=False) - indexed_fields = ("title", "content", "callable_indexed_field", "live") + search_fields = ( + indexed.SearchField('title'), + indexed.SearchField('content'), + indexed.SearchField('callable_indexed_field'), + indexed.SearchField('live'), + ) def callable_indexed_field(self): return "Callable" @@ -96,4 +101,6 @@ class SearchTest(models.Model, Indexed): class SearchTestChild(SearchTest): extra_content = models.TextField() - indexed_fields = "extra_content" + search_fields = SearchTest.search_fields + ( + indexed.SearchField('extra_content'), + ) From 5c64172d02fc2fded5f4ed990f62fa836c5302c3 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 13:44:54 +0100 Subject: [PATCH 143/298] Created ElasticSearchMapping class --- .../wagtailsearch/backends/elasticsearch.py | 92 ++++++++++++------- 1 file changed, 59 insertions(+), 33 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 91536d744..82e76d5fc 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -12,6 +12,40 @@ from wagtail.wagtailsearch.indexed import Indexed from wagtail.wagtailsearch.utils import normalise_query_string +class ElasticSearchMapping(object): + def __init__(self, model): + self.model = model + + def get_document_type(self): + return self.model.indexed_get_content_type() + + def get_mapping(self): + # Get type name + content_type = self.get_document_type() + + # Get indexed fields + indexed_fields = self.model.indexed_get_indexed_fields() + + # Make field list + fields = { + 'pk': dict(type='string', index='not_analyzed', store='yes'), + 'content_type': dict(type='string'), + } + fields.update(indexed_fields) + + return { + content_type: { + 'properties': fields, + } + } + + def get_document_id(self, obj): + return obj.indexed_build_document()['id'] + + def get_document(self, obj): + return obj.indexed_build_document() + + class ElasticSearchQuery(object): def __init__(self, model, query_string, fields=None, filters={}): self.model = model @@ -330,25 +364,11 @@ class ElasticSearch(BaseSearch): self.es.indices.create(self.es_index, INDEX_SETTINGS) def add_type(self, model): - # Get type name - content_type = model.indexed_get_content_type() - - # Get indexed fields - indexed_fields = model.indexed_get_indexed_fields() - - # Make field list - fields = { - "pk": dict(type="string", index="not_analyzed", store="yes"), - "content_type": dict(type="string"), - } - fields.update(indexed_fields) + # Get mapping + mapping = ElasticSearchMapping(model) # Put mapping - self.es.indices.put_mapping(index=self.es_index, doc_type=content_type, body={ - content_type: { - "properties": fields, - } - }) + self.es.indices.put_mapping(index=self.es_index, doc_type=mapping.get_document_type(), body=mapping.get_mapping()) def refresh_index(self): self.es.indices.refresh(self.es_index) @@ -358,11 +378,11 @@ class ElasticSearch(BaseSearch): if not self.object_can_be_indexed(obj): return - # Build document - doc = obj.indexed_build_document() + # Get mapping + mapping = ElasticSearchMapping(obj.__class__) - # Add to index - self.es.index(self.es_index, obj.indexed_get_content_type(), doc, id=doc["id"]) + # Add document to index + self.es.index(self.es_index, mapping.get_document_type(), mapping.get_document(obj), id=mapping.get_document_id(obj)) def add_bulk(self, obj_list): # Group all objects by their type @@ -372,27 +392,30 @@ class ElasticSearch(BaseSearch): if not self.object_can_be_indexed(obj): continue - # Get object type - obj_type = obj.indexed_get_content_type() + # Get mapping + mapping = ElasticSearchMapping(obj.__class__) + + # Get document type + doc_type = mapping.get_document_type() # If type is currently not in set, add it - if obj_type not in type_set: - type_set[obj_type] = [] + if doc_type not in type_set: + type_set[doc_type] = [] - # Add object to set - type_set[obj_type].append(obj.indexed_build_document()) + # Add document to set + type_set[doc_type].append((mapping.get_document_id(obj), mapping.get_document(obj))) # Loop through each type and bulk add them - for type_name, type_objects in type_set.items(): + for type_name, type_documents in type_set.items(): # Get list of actions actions = [] - for obj in type_objects: + for doc_id, doc in type_documents: action = { '_index': self.es_index, '_type': type_name, - '_id': obj['id'], + '_id': doc_id, } - action.update(obj) + action.update(doc) actions.append(action) bulk(self.es, actions) @@ -402,12 +425,15 @@ class ElasticSearch(BaseSearch): if not isinstance(obj, Indexed) or not isinstance(obj, models.Model): return + # Get mapping + mapping = ElasticSearchMapping(obj.__class__) + # Delete document try: self.es.delete( self.es_index, - obj.indexed_get_content_type(), - obj.indexed_get_document_id(), + mapping.get_document_type(), + mapping.get_document_id(obj), ) except NotFoundError: pass # Document doesn't exist, ignore this exception From fefa8c79ef7660d789f109a444ebe2b9fc8b43f8 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 13:51:35 +0100 Subject: [PATCH 144/298] Added repr to ElasticSearchMapping --- wagtail/wagtailsearch/backends/elasticsearch.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 82e76d5fc..9ad1f288a 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -45,6 +45,9 @@ class ElasticSearchMapping(object): def get_document(self, obj): return obj.indexed_build_document() + def __repr__(self): + return '' % (self.model.__name__, ) + class ElasticSearchQuery(object): def __init__(self, model, query_string, fields=None, filters={}): From da9b7c2408474583d66bf1be274e9a0831f36a40 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 13:55:09 +0100 Subject: [PATCH 145/298] Moved document building methods from indexed into ElasticSearchMapping --- .../wagtailsearch/backends/elasticsearch.py | 19 ++++++++++++++-- wagtail/wagtailsearch/indexed.py | 22 ------------------- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 9ad1f288a..bbdbf0ecd 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -40,10 +40,25 @@ class ElasticSearchMapping(object): } def get_document_id(self, obj): - return obj.indexed_build_document()['id'] + return obj.indexed_get_toplevel_content_type() + ':' + str(obj.pk) def get_document(self, obj): - return obj.indexed_build_document() + # Get content type, indexed fields and id + content_type = obj.indexed_get_content_type() + indexed_fields = obj.indexed_get_indexed_fields() + + # Build document + doc = dict(pk=str(obj.pk), content_type=content_type) + for field in indexed_fields.keys(): + if hasattr(obj, field): + doc[field] = getattr(obj, field) + + # Check if this field is callable + if hasattr(doc[field], "__call__"): + # Call it + doc[field] = doc[field]() + + return doc def __repr__(self): return '' % (self.model.__name__, ) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index e2817905d..929bd0dbe 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -65,28 +65,6 @@ class Indexed(object): indexed_fields = parent_indexed_fields return indexed_fields - def indexed_get_document_id(self): - return self.indexed_get_toplevel_content_type() + ":" + str(self.pk) - - def indexed_build_document(self): - # Get content type, indexed fields and id - content_type = self.indexed_get_content_type() - indexed_fields = self.indexed_get_indexed_fields() - doc_id = self.indexed_get_document_id() - - # Build document - doc = dict(pk=str(self.pk), content_type=content_type, id=doc_id) - for field in indexed_fields.keys(): - if hasattr(self, field): - doc[field] = getattr(self, field) - - # Check if this field is callable - if hasattr(doc[field], "__call__"): - # Call it - doc[field] = doc[field]() - - return doc - indexed_fields = () From e81a9f6c6b3aed2a78ea16890dd34930b1f85ab9 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 14:56:56 +0100 Subject: [PATCH 146/298] Added repr to indexed.BaseField --- wagtail/wagtailsearch/indexed.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index 929bd0dbe..334bb30da 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -94,6 +94,9 @@ class BaseField(object): return dic + def __repr__(self): + return "<%s: %s>" % (self.__class__.__name__, self.field_name) + class SearchField(BaseField): def __init__(self, field_name, boost=None, partial_match=False, **kwargs): From 3c5a065a3601ff5b23df8ac9081dc5c88a532234 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 15:00:57 +0100 Subject: [PATCH 147/298] SearchFields configuration is now used in the backends Previously, we just converted them to make them look like indexed_fields. We now convert indexed_fields into SearchFields objects and pass them to the backend. --- wagtail/wagtailsearch/backends/db.py | 2 +- .../wagtailsearch/backends/elasticsearch.py | 20 ++----- wagtail/wagtailsearch/indexed.py | 56 +++++++++++++++++-- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py index 214c71cb3..a7dca12e9 100644 --- a/wagtail/wagtailsearch/backends/db.py +++ b/wagtail/wagtailsearch/backends/db.py @@ -38,7 +38,7 @@ class DBSearch(BaseSearch): # Get fields if fields is None: - fields = model.indexed_get_indexed_fields().keys() + fields = [field.field_name for field in model.get_searchable_search_fields()] # Start will all objects query = model.objects.all() diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index bbdbf0ecd..28127fe83 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -20,21 +20,17 @@ class ElasticSearchMapping(object): return self.model.indexed_get_content_type() def get_mapping(self): - # Get type name - content_type = self.get_document_type() - - # Get indexed fields - indexed_fields = self.model.indexed_get_indexed_fields() - # Make field list fields = { 'pk': dict(type='string', index='not_analyzed', store='yes'), 'content_type': dict(type='string'), } - fields.update(indexed_fields) + + for field in self.model.get_search_fields(): + fields[field.get_attname(self.model)] = field.to_dict(self.model) return { - content_type: { + self.get_document_type(): { 'properties': fields, } } @@ -43,13 +39,9 @@ class ElasticSearchMapping(object): return obj.indexed_get_toplevel_content_type() + ':' + str(obj.pk) def get_document(self, obj): - # Get content type, indexed fields and id - content_type = obj.indexed_get_content_type() - indexed_fields = obj.indexed_get_indexed_fields() - # Build document - doc = dict(pk=str(obj.pk), content_type=content_type) - for field in indexed_fields.keys(): + doc = dict(pk=str(obj.pk), content_type=self.model.indexed_get_content_type()) + for field in [field.get_attname(self.model) for field in self.model.get_search_fields()]: if hasattr(obj, field): doc[field] = getattr(obj, field) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index 334bb30da..b4e67f4c1 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -1,3 +1,5 @@ +import warnings + from six import string_types from django.db import models @@ -35,11 +37,6 @@ class Indexed(object): @classmethod def indexed_get_indexed_fields(cls): - # New way - if hasattr(cls, 'search_fields'): - return dict((field.get_attname(cls), field.to_dict(cls)) for field in cls.search_fields) - - # Old way # Get indexed fields for this class as dictionary indexed_fields = cls.indexed_fields if isinstance(indexed_fields, dict): @@ -65,10 +62,57 @@ class Indexed(object): indexed_fields = parent_indexed_fields return indexed_fields + @classmethod + def get_search_fields(cls): + search_fields = [] + + if hasattr(cls, 'search_fields'): + search_fields.extend(cls.search_fields) + + # Backwards compatibility with old indexed_fields setting + + # Get indexed fields + indexed_fields = cls.indexed_get_indexed_fields() + + # Display deprecation warning if indexed_fields has been used + if indexed_fields: + warnings.warn("'indexed_fields' setting is now deprecated." + "Use 'search_fields' instead.", DeprecationWarning) + + # Convert them into search fields + for field_name, _config in indexed_fields.items(): + # Copy the config to prevent is trashing anything accidentally + config = _config.copy() + + # Check if this is a filter field + if config.get('index', None) == 'not_analyzed': + config.pop('index') + search_fields.append(FilterField(field_name, es_extra=config)) + continue + + # Must be a search field, check for boosting and partial matching + boost = config.pop('boost', None) + + partial_match = False + if config.get('analyzer', None) == 'edgengram_analyzer': + partial_match = True + config.pop('analyzer') + + # Add the field + search_fields.append(SearchField(field_name, boost=boost, partial_match=partial_match, es_extra=config)) + + return search_fields + + @classmethod + def get_searchable_search_fields(cls): + return filter(lambda field: field.searchable, cls.get_search_fields()) + indexed_fields = () class BaseField(object): + searchable = False + def __init__(self, field_name, **kwargs): self.field_name = field_name self.kwargs = kwargs @@ -99,6 +143,8 @@ class BaseField(object): class SearchField(BaseField): + searchable = True + def __init__(self, field_name, boost=None, partial_match=False, **kwargs): super(SearchField, self).__init__(field_name, **kwargs) self.boost = boost From 3ab75c0cfeb0b5e216b30f4b68b5325ea9c0a3c4 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 3 Jul 2014 11:05:56 +0100 Subject: [PATCH 148/298] Update README.rst --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 2866e6c8a..8b99e265a 100644 --- a/README.rst +++ b/README.rst @@ -37,6 +37,8 @@ Getting started * To get you up and running quickly, we've provided a demonstration site with all the configuration in place, at `github.com/torchbox/wagtaildemo `_; see the `README `_ for installation instructions. * See the `Getting Started `_ docs for installation (with the demo app) on a fresh Debian/Ubuntu box with production-ready dependencies, on OS X and on a Vagrant box. * `Serafeim Papastefanos `_ has written a `tutorial `_ with all the steps to build a simple Wagtail site from scratch. +* We've also provided a skeletal django-template to get started on a blank site: +https://github.com/torchbox/wagtail-template Documentation ~~~~~~~~~~~~~ From b0ef94a2db6a5534f62bc959f2d63a40acabd9fd Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 3 Jul 2014 11:06:43 +0100 Subject: [PATCH 149/298] Update README.rst --- README.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 8b99e265a..9ef31fa8e 100644 --- a/README.rst +++ b/README.rst @@ -37,8 +37,7 @@ Getting started * To get you up and running quickly, we've provided a demonstration site with all the configuration in place, at `github.com/torchbox/wagtaildemo `_; see the `README `_ for installation instructions. * See the `Getting Started `_ docs for installation (with the demo app) on a fresh Debian/Ubuntu box with production-ready dependencies, on OS X and on a Vagrant box. * `Serafeim Papastefanos `_ has written a `tutorial `_ with all the steps to build a simple Wagtail site from scratch. -* We've also provided a skeletal django-template to get started on a blank site: -https://github.com/torchbox/wagtail-template +* We've also provided a skeletal django-template to get started on a blank site: https://github.com/torchbox/wagtail-template Documentation ~~~~~~~~~~~~~ From 8bb3703c6eea10e4e02abab134d03131ec68e1d8 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 15:09:31 +0100 Subject: [PATCH 150/298] Created get_field_mapping method on ElasticSearchMapping class --- wagtail/wagtailsearch/backends/elasticsearch.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 28127fe83..ac8ee068b 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -19,6 +19,9 @@ class ElasticSearchMapping(object): def get_document_type(self): return self.model.indexed_get_content_type() + def get_field_mapping(self, field): + return field.get_attname(self.model), field.to_dict(self.model) + def get_mapping(self): # Make field list fields = { @@ -26,8 +29,9 @@ class ElasticSearchMapping(object): 'content_type': dict(type='string'), } - for field in self.model.get_search_fields(): - fields[field.get_attname(self.model)] = field.to_dict(self.model) + fields.update(dict( + self.get_field_mapping(field) for field in self.model.get_search_fields() + )) return { self.get_document_type(): { From 0aca9ece6576640cfd8bac0b508f3a2ffde3ce8b Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 15:29:09 +0100 Subject: [PATCH 151/298] Moved field mapping generation code into ElasticSearchMapping class --- .../wagtailsearch/backends/elasticsearch.py | 19 +++++++++-- wagtail/wagtailsearch/indexed.py | 32 +++---------------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index ac8ee068b..88542f624 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -8,7 +8,7 @@ from elasticsearch import Elasticsearch, NotFoundError, RequestError from elasticsearch.helpers import bulk from wagtail.wagtailsearch.backends.base import BaseSearch -from wagtail.wagtailsearch.indexed import Indexed +from wagtail.wagtailsearch.indexed import Indexed, SearchField, FilterField from wagtail.wagtailsearch.utils import normalise_query_string @@ -20,7 +20,22 @@ class ElasticSearchMapping(object): return self.model.indexed_get_content_type() def get_field_mapping(self, field): - return field.get_attname(self.model), field.to_dict(self.model) + mapping = {'type': 'string'} + + if isinstance(field, SearchField): + if field.boost: + mapping['boost'] = field.boost + + if field.partial_match: + mapping['analyzer'] = 'edgengram_analyzer' + elif isinstance(field, FilterField): + mapping['index'] = 'not_analyzed' + + if 'es_extra' in field.kwargs: + for key, value in field.kwargs['es_extra'].items(): + mapping[key] = value + + return field.get_index_name(self.model), mapping def get_mapping(self): # Make field list diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index b4e67f4c1..347e41c0c 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -112,6 +112,7 @@ class Indexed(object): class BaseField(object): searchable = False + suffix = '' def __init__(self, field_name, **kwargs): self.field_name = field_name @@ -127,16 +128,8 @@ class BaseField(object): except models.fields.FieldDoesNotExist: return self.field_name - def to_dict(self, cls): - dic = { - 'type': 'string' - } - - if 'es_extra' in self.kwargs: - for key, value in self.kwargs['es_extra'].items(): - dic[key] = value - - return dic + def get_index_name(self, cls): + return self.get_attname(cls) + self.suffix def __repr__(self): return "<%s: %s>" % (self.__class__.__name__, self.field_name) @@ -150,23 +143,6 @@ class SearchField(BaseField): self.boost = boost self.partial_match = partial_match - def to_dict(self, cls): - dic = super(SearchField, self).to_dict(cls) - - if self.boost and 'boost' not in dic: - dic['boost'] = self.boost - - if self.partial_match and 'analyzer' not in dic: - dic['analyzer'] = 'edgengram_analyzer' - - return dic - class FilterField(BaseField): - def to_dict(self, cls): - dic = super(FilterField, self).to_dict(cls) - - if 'index' not in dic: - dic['index'] = 'not_analyzed' - - return dic + suffix = '_filter' From 5e76a54b2b4046b4a6a177c04c3ad8fc3bc345fe Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 15:36:10 +0100 Subject: [PATCH 152/298] Remove any duplicate search fields of the same type --- wagtail/wagtailsearch/indexed.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index 347e41c0c..aba3003f7 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -101,6 +101,13 @@ class Indexed(object): # Add the field search_fields.append(SearchField(field_name, boost=boost, partial_match=partial_match, es_extra=config)) + # Remove any duplicate entries into search fields + # We need to take into account that fields can be indexed as both a SearchField and as a FilterField + search_fields_dict = {} + for field in search_fields: + search_fields_dict[(field.field_name, type(field))] = field + search_fields = search_fields_dict.values() + return search_fields @classmethod From 6d21727b034a1f0147c1be987aab27e4728a5199 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 15:48:51 +0100 Subject: [PATCH 153/298] Cleaned up database backend search method --- wagtail/wagtailsearch/backends/db.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py index a7dca12e9..5ed8e07df 100644 --- a/wagtail/wagtailsearch/backends/db.py +++ b/wagtail/wagtailsearch/backends/db.py @@ -49,7 +49,7 @@ class DBSearch(BaseSearch): # Filter by terms for term in terms: - term_query = None + term_query = models.Q() for field_name in fields: # Check if the field exists (this will filter out indexed callables) try: @@ -58,11 +58,8 @@ class DBSearch(BaseSearch): continue # Filter on this field - field_filter = {'%s__icontains' % field_name: term} - if term_query is None: - term_query = models.Q(**field_filter) - else: - term_query |= models.Q(**field_filter) + term_query |= models.Q(**{'%s__icontains' % field_name: term}) + query = query.filter(term_query) # Distinct From 67ed563dd74602a1cfb79b2d1e274c3c8aa8cf2d Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 15:52:06 +0100 Subject: [PATCH 154/298] Made quotes more consistant --- .../wagtailsearch/backends/elasticsearch.py | 62 +++++++++---------- wagtail/wagtailsearch/indexed.py | 4 +- .../management/commands/update_index.py | 6 +- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 88542f624..4890b5e52 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -65,7 +65,7 @@ class ElasticSearchMapping(object): doc[field] = getattr(obj, field) # Check if this field is callable - if hasattr(doc[field], "__call__"): + if hasattr(doc[field], '__call__'): # Call it doc[field] = doc[field]() @@ -346,43 +346,43 @@ class ElasticSearch(BaseSearch): # Settings INDEX_SETTINGS = { - "settings": { - "analysis": { - "analyzer": { - "ngram_analyzer": { - "type": "custom", - "tokenizer": "lowercase", - "filter": ["ngram"] + 'settings': { + 'analysis': { + 'analyzer': { + 'ngram_analyzer': { + 'type': 'custom', + 'tokenizer': 'lowercase', + 'filter': ['ngram'] }, - "edgengram_analyzer": { - "type": "custom", - "tokenizer": "lowercase", - "filter": ["edgengram"] + 'edgengram_analyzer': { + 'type': 'custom', + 'tokenizer': 'lowercase', + 'filter': ['edgengram'] } }, - "tokenizer": { - "ngram_tokenizer": { - "type": "nGram", - "min_gram": 3, - "max_gram": 15, + 'tokenizer': { + 'ngram_tokenizer': { + 'type': 'nGram', + 'min_gram': 3, + 'max_gram': 15, }, - "edgengram_tokenizer": { - "type": "edgeNGram", - "min_gram": 2, - "max_gram": 15, - "side": "front" + 'edgengram_tokenizer': { + 'type': 'edgeNGram', + 'min_gram': 2, + 'max_gram': 15, + 'side': 'front' } }, - "filter": { - "ngram": { - "type": "nGram", - "min_gram": 3, - "max_gram": 15 + 'filter': { + 'ngram': { + 'type': 'nGram', + 'min_gram': 3, + 'max_gram': 15 }, - "edgengram": { - "type": "edgeNGram", - "min_gram": 1, - "max_gram": 15 + 'edgengram': { + 'type': 'edgeNGram', + 'min_gram': 1, + 'max_gram': 15 } } } diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index aba3003f7..b4626914f 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -49,7 +49,7 @@ class Indexed(object): if isinstance(indexed_fields, string_types): indexed_fields = [indexed_fields] if isinstance(indexed_fields, list): - indexed_fields = dict((field, dict(type="string")) for field in indexed_fields) + indexed_fields = dict((field, dict(type='string')) for field in indexed_fields) if not isinstance(indexed_fields, dict): raise ValueError() @@ -139,7 +139,7 @@ class BaseField(object): return self.get_attname(cls) + self.suffix def __repr__(self): - return "<%s: %s>" % (self.__class__.__name__, self.field_name) + return '<%s: %s>' % (self.__class__.__name__, self.field_name) class SearchField(BaseField): diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py index 8f1605b24..ee85da8ff 100644 --- a/wagtail/wagtailsearch/management/commands/update_index.py +++ b/wagtail/wagtailsearch/management/commands/update_index.py @@ -25,13 +25,13 @@ class Command(BaseCommand): # Loop through objects for obj in model.objects.all(): - # Check if this object has an "object_indexed" function - if hasattr(obj, "object_indexed"): + # Check if this object has an 'object_indexed' function + if hasattr(obj, 'object_indexed'): if obj.object_indexed() is False: continue # Get key for this object - key = toplevel_content_type + ":" + str(obj.pk) + key = toplevel_content_type + ':' + str(obj.pk) # Check if this key already exists if key in object_set: From f2d1c803783a4e69e84d46b5f87dd58b41cfc770 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 6 Apr 2014 14:21:40 +0100 Subject: [PATCH 155/298] Don't run tests with wagtailsearch signal handlers enabled --- wagtail/tests/urls.py | 4 ---- wagtail/wagtailsearch/tests/test_backends.py | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index 83e12adfb..385d0e6cf 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -6,10 +6,6 @@ from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls from wagtail.contrib.wagtailsitemaps.views import sitemap -# Signal handlers -from wagtail.wagtailsearch import register_signal_handlers as wagtailsearch_register_signal_handlers -wagtailsearch_register_signal_handlers() - urlpatterns = patterns('', url(r'^admin/', include(wagtailadmin_urls)), diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index 8fab1d152..86a67f21a 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -11,11 +11,6 @@ from wagtail.wagtailsearch.backends.db import DBSearch from wagtail.wagtailsearch.backends import InvalidSearchBackendError -# Register wagtailsearch signal handlers -from wagtail.wagtailsearch import register_signal_handlers -register_signal_handlers() - - class BackendTests(object): # To test a specific backend, subclass BackendTests and define self.backend_path. @@ -41,21 +36,25 @@ class BackendTests(object): testa = models.SearchTest() testa.title = "Hello World" testa.save() + self.backend.add(testa) self.testa = testa testb = models.SearchTest() testb.title = "Hello" testb.live = True testb.save() + self.backend.add(testb) testc = models.SearchTestChild() testc.title = "Hello" testc.live = True testc.save() + self.backend.add(testc) testd = models.SearchTestChild() testd.title = "World" testd.save() + self.backend.add(testd) # Refresh the index self.backend.refresh_index() @@ -130,6 +129,7 @@ class BackendTests(object): def test_delete(self): # Delete one of the objects + self.backend.delete(self.testa) self.testa.delete() # Refresh index From 6847109bb994580e67ca33ba93f1c382ab81ec6e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 29 Apr 2014 11:54:02 +0100 Subject: [PATCH 156/298] Removed 'object_indexed' check from update_index command Conflicts: wagtail/wagtailsearch/management/commands/update_index.py --- wagtail/wagtailsearch/management/commands/update_index.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py index ee85da8ff..0b4cb695f 100644 --- a/wagtail/wagtailsearch/management/commands/update_index.py +++ b/wagtail/wagtailsearch/management/commands/update_index.py @@ -25,11 +25,6 @@ class Command(BaseCommand): # Loop through objects for obj in model.objects.all(): - # Check if this object has an 'object_indexed' function - if hasattr(obj, 'object_indexed'): - if obj.object_indexed() is False: - continue - # Get key for this object key = toplevel_content_type + ':' + str(obj.pk) From b1fb9dc2e249024961323d6f34ce4ee970a698fe Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 15:59:39 +0100 Subject: [PATCH 157/298] Fixed a few more double quotes --- wagtail/wagtailsearch/indexed.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index b4626914f..4b636497b 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -15,13 +15,13 @@ class Indexed(object): @classmethod def indexed_get_content_type(cls): # Work out content type - content_type = (cls._meta.app_label + "_" + cls.__name__).lower() + content_type = (cls._meta.app_label + '_' + cls.__name__).lower() # Get parent content type parent = cls.indexed_get_parent() if parent: parent_content_type = parent.indexed_get_content_type() - return parent_content_type + "_" + content_type + return parent_content_type + '_' + content_type else: return content_type @@ -33,7 +33,7 @@ class Indexed(object): return parent.indexed_get_content_type() else: # At toplevel, return this content type - return (cls._meta.app_label + "_" + cls.__name__).lower() + return (cls._meta.app_label + '_' + cls.__name__).lower() @classmethod def indexed_get_indexed_fields(cls): From 4a70a4251b7ec5140351f7d2f255d3ccfc81894b Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 6 Apr 2014 14:41:40 +0100 Subject: [PATCH 158/298] Give some feedback from the add_bulk command --- wagtail/wagtailsearch/backends/db.py | 4 ++-- wagtail/wagtailsearch/backends/elasticsearch.py | 1 + wagtail/wagtailsearch/management/commands/update_index.py | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py index 5ed8e07df..4c05b19df 100644 --- a/wagtail/wagtailsearch/backends/db.py +++ b/wagtail/wagtailsearch/backends/db.py @@ -22,7 +22,7 @@ class DBSearch(BaseSearch): pass # Not needed def add_bulk(self, obj_list): - pass # Not needed + return [] # Not needed def delete(self, obj): pass # Not needed @@ -70,4 +70,4 @@ class DBSearch(BaseSearch): for prefetch in prefetch_related: query = query.prefetch_related(prefetch) - return query \ No newline at end of file + return query diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 4890b5e52..dbe755ff1 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -447,6 +447,7 @@ class ElasticSearch(BaseSearch): action.update(doc) actions.append(action) + yield type_name, len(type_documents) bulk(self.es, actions) def delete(self, obj): diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py index 0b4cb695f..2c1593635 100644 --- a/wagtail/wagtailsearch/management/commands/update_index.py +++ b/wagtail/wagtailsearch/management/commands/update_index.py @@ -57,10 +57,8 @@ class Command(BaseCommand): # Add objects to index self.stdout.write("Adding objects") - results = s.add_bulk(object_set.values()) - if results: - for result in results: - self.stdout.write(result[0] + ' ' + str(result[1])) + for result in s.add_bulk(object_set.values()): + self.stdout.write(result[0] + ' ' + str(result[1])) # Refresh index self.stdout.write("Refreshing index") From 673da4ab021eb7f2fa14d9e194d12689373ba9c5 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 17:19:32 +0100 Subject: [PATCH 159/298] Set index:'not_analysed' setting on content_type field --- wagtail/wagtailsearch/backends/elasticsearch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index dbe755ff1..8fb706bba 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -41,7 +41,7 @@ class ElasticSearchMapping(object): # Make field list fields = { 'pk': dict(type='string', index='not_analyzed', store='yes'), - 'content_type': dict(type='string'), + 'content_type': dict(type='string', index='not_analyzed'), } fields.update(dict( From 584f5a7049a587f1da398ad421f9afd40a13fde8 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 16:22:35 +0100 Subject: [PATCH 160/298] Index fields with correct type in ElasticSearch Previously, everything was converted to a string before indexing in ElasticSearch. This caused issues where certian filters may not work as expected (such as a greater than filter on an integer field) This commit changes this by adding type conversion into the ElasticSearch backend. --- .../wagtailsearch/backends/elasticsearch.py | 38 ++++++++++++++----- wagtail/wagtailsearch/indexed.py | 20 ++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 8fb706bba..7ffebd045 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -13,6 +13,32 @@ from wagtail.wagtailsearch.utils import normalise_query_string class ElasticSearchMapping(object): + TYPE_MAP = { + 'AutoField': 'integer', + 'BinaryField': 'binary', + 'BooleanField': 'boolean', + 'CharField': 'string', + 'CommaSeparatedIntegerField': 'string', + 'DateField': 'date', + 'DateTimeField': 'date', + 'DecimalField': 'double', + 'FileField': 'string', + 'FilePathField': 'string', + 'FloatField': 'double', + 'IntegerField': 'integer', + 'BigIntegerField': 'long', + 'IPAddressField': 'string', + 'GenericIPAddressField': 'string', + 'NullBooleanField': 'boolean', + 'OneToOneField': 'integer', + 'PositiveIntegerField': 'integer', + 'PositiveSmallIntegerField': 'integer', + 'SlugField': 'string', + 'SmallIntegerField': 'integer', + 'TextField': 'string', + 'TimeField': 'date', + } + def __init__(self, model): self.model = model @@ -20,7 +46,7 @@ class ElasticSearchMapping(object): return self.model.indexed_get_content_type() def get_field_mapping(self, field): - mapping = {'type': 'string'} + mapping = {'type': self.TYPE_MAP.get(field.get_type(self.model), 'string')} if isinstance(field, SearchField): if field.boost: @@ -60,14 +86,8 @@ class ElasticSearchMapping(object): def get_document(self, obj): # Build document doc = dict(pk=str(obj.pk), content_type=self.model.indexed_get_content_type()) - for field in [field.get_attname(self.model) for field in self.model.get_search_fields()]: - if hasattr(obj, field): - doc[field] = getattr(obj, field) - - # Check if this field is callable - if hasattr(doc[field], '__call__'): - # Call it - doc[field] = doc[field]() + for field in self.model.get_search_fields(): + doc[field.get_index_name(self.model)] = field.get_value(obj) return doc diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index 4b636497b..b290f440b 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -138,6 +138,26 @@ class BaseField(object): def get_index_name(self, cls): return self.get_attname(cls) + self.suffix + def get_type(self, cls): + if 'type' in self.kwargs: + return self.kwargs['type'] + + try: + field = self.get_field(cls) + return field.get_internal_type() + except models.fields.FieldDoesNotExist: + return 'CharField' + + def get_value(self, obj): + try: + field = self.get_field(obj.__class__) + return field._get_val_from_obj(obj) + except models.fields.FieldDoesNotExist: + value = getattr(obj, self.field_name, None) + if hasattr(value, '__call__'): + value = value() + return value + def __repr__(self): return '<%s: %s>' % (self.__class__.__name__, self.field_name) From de3f852e4320e6b1211b2660fa3b60a08377210e Mon Sep 17 00:00:00 2001 From: Tom Talbot Date: Thu, 3 Jul 2014 11:41:23 +0100 Subject: [PATCH 161/298] Removed EditHandler tests. Added more FieldPanel tests --- .../wagtailadmin/tests/test_edit_handlers.py | 133 ++++++------------ 1 file changed, 44 insertions(+), 89 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index 53afbd349..fa9f3f650 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -63,70 +63,6 @@ class TestExtractPanelDefinitionsFromModelClass(TestCase): self.assertTrue(issubclass(panel, BaseFieldPanel)) -class TestEditHandler(TestCase): - class FakeForm(dict): - def __init__(self, *args, **kwargs): - self.fields = self.fields_iterator() - - def fields_iterator(self): - for i in self: - yield i - - def setUp(self): - self.edit_handler = EditHandler(form=True, instance=True) - self.edit_handler.render = lambda: "foo" - - def test_widget_overrides(self): - result = EditHandler.widget_overrides() - self.assertEqual(result, {}) - - def test_required_formsets(self): - result = EditHandler.required_formsets() - self.assertEqual(result, []) - - def test_get_form_class(self): - result = EditHandler.get_form_class(Page) - self.assertTrue(issubclass(result, WagtailAdminModelForm)) - - def test_edit_handler_init_no_instance(self): - self.assertRaises(ValueError, EditHandler, form=True) - - def test_edit_handler_init_no_form(self): - self.assertRaises(ValueError, EditHandler, instance=True) - - def test_field_type(self): - result = self.edit_handler.field_type() - self.assertEqual(result, "") - - def test_render_as_object(self): - result = self.edit_handler.render_as_object() - self.assertEqual(result, "foo") - - def test_render_as_field(self): - result = self.edit_handler.render_as_field() - self.assertEqual(result, "foo") - - def test_render_js(self): - result = self.edit_handler.render_js() - self.assertEqual(result, "") - - def test_rendered_fields(self): - result = self.edit_handler.rendered_fields() - self.assertEqual(result, []) - - def test_render_missing_fields(self): - fake_form = self.FakeForm() - fake_form["foo"] = "bar" - self.edit_handler.form = fake_form - self.assertEqual(self.edit_handler.render_missing_fields(), "bar") - - def test_render_form_content(self): - fake_form = self.FakeForm() - fake_form["foo"] = "bar" - self.edit_handler.form = fake_form - self.assertEqual(self.edit_handler.render_form_content(), "foobar") - - class TestTabbedInterface(TestCase): class FakeChild(object): class FakeGrandchild(object): @@ -183,34 +119,10 @@ class TestObjectList(TestCase): self.assertTrue(issubclass(object_list, BaseObjectList)) -class TestBaseFieldPanel(TestCase): - class FakeClass(object): - required = False - - class FakeField(object): - label = 'label' - help_text = 'help text' - - def setUp(self): - fake_field = self.FakeField() - fake_base_field_panel = type('_FieldPanel', - (BaseFieldPanel,), - {'field_name': 'barbecue'}) - self.base_field_panel = fake_base_field_panel( - instance=True, - form={'barbecue': fake_field}) - - def test_field_type(self): - fake_object = self.FakeClass() - another_fake_object = self.FakeClass() - fake_object.field = another_fake_object - self.base_field_panel.bound_field = fake_object - self.assertEqual(self.base_field_panel.field_type(), 'fake_class') - - class TestFieldPanel(TestCase): class FakeClass(object): required = False + widget = 'fake widget' class FakeField(object): label = 'label' @@ -218,6 +130,14 @@ class TestFieldPanel(TestCase): errors = ['errors'] id_for_label = 'id for label' + class FakeForm(dict): + def __init__(self, *args, **kwargs): + self.fields = self.fields_iterator() + + def fields_iterator(self): + for i in self: + yield i + def setUp(self): fake_field = self.FakeField() fake_field.field = self.FakeClass() @@ -258,6 +178,41 @@ class TestFieldPanel(TestCase): result = self.field_panel.rendered_fields() self.assertEqual(result, ['barbecue']) + def test_field_type(self): + fake_object = self.FakeClass() + another_fake_object = self.FakeClass() + fake_object.field = another_fake_object + self.field_panel.bound_field = fake_object + self.assertEqual(self.field_panel.field_type(), 'fake_class') + + def test_widget_overrides(self): + result = self.field_panel.widget_overrides() + self.assertEqual(result, {}) + + def test_required_formsets(self): + result = self.field_panel.required_formsets() + self.assertEqual(result, []) + + def test_get_form_class(self): + result = self.field_panel.get_form_class(Page) + self.assertTrue(issubclass(result, WagtailAdminModelForm)) + + def test_render_js(self): + result = self.field_panel.render_js() + self.assertEqual(result, "") + + def test_render_missing_fields(self): + fake_form = self.FakeForm() + fake_form["foo"] = "bar" + self.field_panel.form = fake_form + self.assertEqual(self.field_panel.render_missing_fields(), "bar") + + def test_render_form_content(self): + fake_form = self.FakeForm() + fake_form["foo"] = "bar" + self.field_panel.form = fake_form + self.assertIn("bar", self.field_panel.render_form_content()) + class TestRichTextFieldPanel(TestCase): class FakeField(object): From e1721030dcb8391617af28c3e4f04503862eb1b1 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 17:13:34 +0100 Subject: [PATCH 162/298] Exclude filter fields from _all. Explicitly include search fields in _all --- wagtail/wagtailsearch/backends/elasticsearch.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 7ffebd045..5e9e6e984 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -54,8 +54,11 @@ class ElasticSearchMapping(object): if field.partial_match: mapping['analyzer'] = 'edgengram_analyzer' + + mapping['include_in_all'] = True elif isinstance(field, FilterField): mapping['index'] = 'not_analyzed' + mapping['include_in_all'] = False if 'es_extra' in field.kwargs: for key, value in field.kwargs['es_extra'].items(): @@ -66,8 +69,8 @@ class ElasticSearchMapping(object): def get_mapping(self): # Make field list fields = { - 'pk': dict(type='string', index='not_analyzed', store='yes'), - 'content_type': dict(type='string', index='not_analyzed'), + 'pk': dict(type='string', index='not_analyzed', store='yes', include_in_all=False), + 'content_type': dict(type='string', index='not_analyzed', include_in_all=False), } fields.update(dict( From ca1fa1d93341f21f60d0fdde943c062f5c4b343c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 17:32:06 +0100 Subject: [PATCH 163/298] Index partials together into '_partials' --- wagtail/wagtailsearch/backends/elasticsearch.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 5e9e6e984..8fc2950dd 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -71,6 +71,7 @@ class ElasticSearchMapping(object): fields = { 'pk': dict(type='string', index='not_analyzed', store='yes', include_in_all=False), 'content_type': dict(type='string', index='not_analyzed', include_in_all=False), + '_partials': dict(type='string', analyzer='edgengram_analyzer', include_in_all=False), } fields.update(dict( @@ -89,8 +90,18 @@ class ElasticSearchMapping(object): def get_document(self, obj): # Build document doc = dict(pk=str(obj.pk), content_type=self.model.indexed_get_content_type()) + partials = [] for field in self.model.get_search_fields(): - doc[field.get_index_name(self.model)] = field.get_value(obj) + value = field.get_value(obj) + + doc[field.get_index_name(self.model)] = value + + # Check if this field should be added into _partials + if isinstance(field, SearchField) and field.partial_match: + partials.append(value) + + # Add partials to document + doc['_partials'] = partials return doc @@ -102,7 +113,7 @@ class ElasticSearchQuery(object): def __init__(self, model, query_string, fields=None, filters={}): self.model = model self.query_string = query_string - self.fields = fields or ['_all'] + self.fields = fields or ['_all', '_partials'] self.filters = filters def _get_filters(self): From b15522ac1e08dd18af9a9988f619eed9e0e22f20 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 15:49:19 +0100 Subject: [PATCH 164/298] Implemented search on queryset --- .../wagtailsearch/backends/elasticsearch.py | 204 ++++++++++++------ wagtail/wagtailsearch/indexed.py | 9 +- wagtail/wagtailsearch/models.py | 2 +- 3 files changed, 146 insertions(+), 69 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 8fc2950dd..a8c590de2 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -3,6 +3,7 @@ from __future__ import absolute_import import json from django.db import models +from django.db.models.query import QuerySet from elasticsearch import Elasticsearch, NotFoundError, RequestError from elasticsearch.helpers import bulk @@ -109,12 +110,123 @@ class ElasticSearchMapping(object): return '' % (self.model.__name__, ) +class FilterError(Exception): + pass + + +class FieldError(Exception): + pass + + class ElasticSearchQuery(object): - def __init__(self, model, query_string, fields=None, filters={}): - self.model = model + def __init__(self, queryset, query_string, fields=None): + self.queryset = queryset self.query_string = query_string - self.fields = fields or ['_all', '_partials'] - self.filters = filters + self.fields = fields or ['_all', 'partials'] + + def _get_filters_from_where(self, where_node): + # Check if this is a leaf node + if isinstance(where_node, tuple): + field_name = where_node[0].col + lookup = where_node[1] + value = where_node[3] + + # Get field + field = dict( + (field.get_attname(self.queryset.model), field) + for field in self.queryset.model.get_filterable_search_fields() + ).get(field_name, None) + + # Give error if the field doesn't exist + if field is None: + raise FieldError('Cannot filter ElasticSearch results with field "' + field_name + '". Please add FilterField(\'' + field_name + '\') to ' + self.queryset.model.__name__ + '.search_fields.') + + # Get the name of the field in the index + field_index_name = field.get_index_name(self.queryset.model) + + # Find lookup + if lookup == 'exact': + if value is None: + return { + 'missing': { + 'field': field_index_name, + } + } + else: + return { + 'term': { + field_index_name: value, + } + } + + if lookup == 'isnull': + if value: + return { + 'missing': { + 'field': field_index_name, + } + } + else: + return { + 'not': { + 'missing': { + 'field': field_index_name, + } + } + } + + if lookup in ['startswith', 'prefix']: + return { + 'prefix': { + field_index_name: value, + } + } + + if lookup in ['gt', 'gte', 'lt', 'lte']: + return { + 'range': { + field_index_name: { + lookup: value, + } + } + } + + if lookup == 'range': + lower, upper = value + + return { + 'range': { + field_index_name: { + 'gte': lower, + 'lte': upper, + } + } + } + + raise FilterError('Could not apply filter on ElasticSearch results "' + field_name + '__' + lookup + ' = ' + unicode(value) + '". Lookup "' + lookup + '"" not recognosed.') + + # Get child filters + connector = where_node.connector + child_filters = [self._get_filters_from_where(child) for child in where_node.children] + child_filters = [child_filter for child_filter in child_filters if child_filter] + + # Connect them + if child_filters: + if len(child_filters) == 1: + filter_out = child_filters[0] + else: + filter_out = { + connector.lower(): [ + fil for fil in child_filters if fil is not None + ] + } + + if where_node.negated: + filter_out = { + 'not': filter_out + } + + return filter_out def _get_filters(self): # Filters @@ -123,59 +235,14 @@ class ElasticSearchQuery(object): # Filter by content type filters.append({ 'prefix': { - 'content_type': self.model.indexed_get_content_type() + 'content_type': self.queryset.model.indexed_get_content_type() } }) - # Extra filters - if self.filters: - for key, value in self.filters.items(): - if '__' in key: - field, lookup = key.split('__') - else: - field = key - lookup = None - - if lookup is None: - if value is None: - filters.append({ - 'missing': { - 'field': field, - } - }) - else: - filters.append({ - 'term': { - field: value - } - }) - - if lookup in ['startswith', 'prefix']: - filters.append({ - 'prefix': { - field: value - } - }) - - if lookup in ['gt', 'gte', 'lt', 'lte']: - filters.append({ - 'range': { - field: { - lookup: value, - } - } - }) - - if lookup == 'range': - lower, upper = value - filters.append({ - 'range': { - field: { - 'gte': lower, - 'lte': upper, - } - } - }) + # Apply filters from queryset + queryset_filters = self._get_filters_from_where(self.queryset.query.where) + if queryset_filters: + filters.append(queryset_filters) return filters @@ -263,15 +330,8 @@ class ElasticSearchResults(object): # Initialise results dictionary results = dict((str(pk), None) for pk in pks) - # Get queryset - queryset = self.query.model.objects.filter(pk__in=pks) - - # Add prefetch related - if self.prefetch_related: - for prefetch in self.prefetch_related: - queryset = queryset.prefetch_related(prefetch) - # Find objects in database and add them to dict + queryset = self.query.queryset.filter(pk__in=pks) for obj in queryset: results[str(obj.pk)] = obj @@ -502,7 +562,15 @@ class ElasticSearch(BaseSearch): except NotFoundError: pass # Document doesn't exist, ignore this exception - def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]): + def search(self, query_string, model_or_queryset, fields=None, filters={}, prefetch_related=[]): + # Find model/queryset + if isinstance(model_or_queryset, QuerySet): + model = model_or_queryset.model + queryset = model_or_queryset + else: + model = model_or_queryset + queryset = model_or_queryset.objects.all() + # Model must be a descendant of Indexed and be a django model if not issubclass(model, Indexed) or not issubclass(model, models.Model): return [] @@ -514,5 +582,13 @@ class ElasticSearch(BaseSearch): if not query_string: return [] + # Apply filters to queryset + if filters: + queryset = queryset.filter(**filters) + + # Prefetch related + for prefetch in prefetch_related: + queryset = queryset.prefetch_related(prefetch) + # Return search results - return ElasticSearchResults(self, ElasticSearchQuery(model, query_string, fields=fields, filters=filters), prefetch_related=prefetch_related) + return ElasticSearchResults(self, ElasticSearchQuery(queryset, query_string, fields=fields)) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index b290f440b..a2cb54d14 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -112,13 +112,16 @@ class Indexed(object): @classmethod def get_searchable_search_fields(cls): - return filter(lambda field: field.searchable, cls.get_search_fields()) + return filter(lambda field: isinstance(field, SearchField), cls.get_search_fields()) + + @classmethod + def get_filterable_search_fields(cls): + return filter(lambda field: isinstance(field, FilterField), cls.get_search_fields()) indexed_fields = () class BaseField(object): - searchable = False suffix = '' def __init__(self, field_name, **kwargs): @@ -163,8 +166,6 @@ class BaseField(object): class SearchField(BaseField): - searchable = True - def __init__(self, field_name, boost=None, partial_match=False, **kwargs): super(SearchField, self).__init__(field_name, **kwargs) self.boost = boost diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py index 509368463..7cb8546d7 100644 --- a/wagtail/wagtailsearch/models.py +++ b/wagtail/wagtailsearch/models.py @@ -91,7 +91,7 @@ class SearchTest(models.Model, indexed.Indexed): indexed.SearchField('title'), indexed.SearchField('content'), indexed.SearchField('callable_indexed_field'), - indexed.SearchField('live'), + indexed.FilterField('live'), ) def callable_indexed_field(self): From 41199dd576ee9a4ad3ed5cbf414e655499bb2088 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 15:51:29 +0100 Subject: [PATCH 165/298] Minor optimisation in ElasticSearchQuery --- .../wagtailsearch/backends/elasticsearch.py | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index a8c590de2..649a7a7f0 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -260,15 +260,24 @@ class ElasticSearchQuery(object): # Filters filters = self._get_filters() - - return { - 'filtered': { - 'query': query, - 'filter': { - 'and': filters, + if len(filters) == 1: + query = { + 'filtered': { + 'query': query, + 'filter': filters[0], } } - } + elif len(filters) > 1: + query = { + 'filtered': { + 'query': query, + 'filter': { + 'and': filters, + } + } + } + + return query def __repr__(self): return json.dumps(self.to_es()) From d872768baffe4f6aa2e66ad92a82f1a3f075d69e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 16:01:04 +0100 Subject: [PATCH 166/298] Allow query_string to be set to None This allows match_all queries to be created --- wagtail/wagtailsearch/backends/db.py | 47 ++++++++++--------- .../wagtailsearch/backends/elasticsearch.py | 24 ++++++---- 2 files changed, 39 insertions(+), 32 deletions(-) diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py index 4c05b19df..c91363740 100644 --- a/wagtail/wagtailsearch/backends/db.py +++ b/wagtail/wagtailsearch/backends/db.py @@ -28,42 +28,43 @@ class DBSearch(BaseSearch): pass # Not needed def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]): - # Normalise query string - query_string = normalise_query_string(query_string) - - # Get terms - terms = query_string.split() - if not terms: - return model.objects.none() - # Get fields if fields is None: fields = [field.field_name for field in model.get_searchable_search_fields()] - # Start will all objects + # Start with all objects query = model.objects.all() # Apply filters if filters: query = query.filter(**filters) - # Filter by terms - for term in terms: - term_query = models.Q() - for field_name in fields: - # Check if the field exists (this will filter out indexed callables) - try: - model._meta.get_field_by_name(field_name) - except: - continue + if query_string is not None: + # Normalise query string + query_string = normalise_query_string(query_string) - # Filter on this field - term_query |= models.Q(**{'%s__icontains' % field_name: term}) + # Get terms + terms = query_string.split() + if not terms: + return model.objects.none() - query = query.filter(term_query) + # Filter by terms + for term in terms: + term_query = models.Q() + for field_name in fields: + # Check if the field exists (this will filter out indexed callables) + try: + model._meta.get_field_by_name(field_name) + except: + continue - # Distinct - query = query.distinct() + # Filter on this field + term_query |= models.Q(**{'%s__icontains' % field_name: term}) + + query = query.filter(term_query) + + # Distinct + query = query.distinct() # Prefetch related if prefetch_related: diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 649a7a7f0..af810b02b 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -248,15 +248,20 @@ class ElasticSearchQuery(object): def to_es(self): # Query - query = { - 'query_string': { - 'query': self.query_string, + if self.query_string is not None: + query = { + 'query_string': { + 'query': self.query_string, + } } - } - # Fields - if self.fields: - query['query_string']['fields'] = self.fields + # Fields + if self.fields: + query['query_string']['fields'] = self.fields + else: + query = { + 'match_all': {} + } # Filters filters = self._get_filters() @@ -585,10 +590,11 @@ class ElasticSearch(BaseSearch): return [] # Normalise query string - query_string = normalise_query_string(query_string) + if query_string is not None: + query_string = normalise_query_string(query_string) # Check that theres still a query string after the clean up - if not query_string: + if query_string == "": return [] # Apply filters to queryset From 156eb89850e1efdcdc2b6fc31fb74681441098dd Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 16:10:50 +0100 Subject: [PATCH 167/298] Changed default values of filters and prefetch_related to None --- wagtail/wagtailsearch/backends/db.py | 2 +- wagtail/wagtailsearch/backends/elasticsearch.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py index c91363740..56536e343 100644 --- a/wagtail/wagtailsearch/backends/db.py +++ b/wagtail/wagtailsearch/backends/db.py @@ -27,7 +27,7 @@ class DBSearch(BaseSearch): def delete(self, obj): pass # Not needed - def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]): + def search(self, query_string, model, fields=None, filters=None, prefetch_related=None): # Get fields if fields is None: fields = [field.field_name for field in model.get_searchable_search_fields()] diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index af810b02b..14b1a3bdb 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -576,7 +576,7 @@ class ElasticSearch(BaseSearch): except NotFoundError: pass # Document doesn't exist, ignore this exception - def search(self, query_string, model_or_queryset, fields=None, filters={}, prefetch_related=[]): + def search(self, query_string, model_or_queryset, fields=None, filters=None, prefetch_related=None): # Find model/queryset if isinstance(model_or_queryset, QuerySet): model = model_or_queryset.model @@ -602,8 +602,9 @@ class ElasticSearch(BaseSearch): queryset = queryset.filter(**filters) # Prefetch related - for prefetch in prefetch_related: - queryset = queryset.prefetch_related(prefetch) + if prefetch_related: + for prefetch in prefetch_related: + queryset = queryset.prefetch_related(prefetch) # Return search results return ElasticSearchResults(self, ElasticSearchQuery(queryset, query_string, fields=fields)) From 8a99a63cf1df057e126d6a4d841f8af05ad97644 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 17:37:18 +0100 Subject: [PATCH 168/298] Fixed typo --- wagtail/wagtailsearch/backends/elasticsearch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 14b1a3bdb..ea0413eed 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -122,7 +122,7 @@ class ElasticSearchQuery(object): def __init__(self, queryset, query_string, fields=None): self.queryset = queryset self.query_string = query_string - self.fields = fields or ['_all', 'partials'] + self.fields = fields or ['_all', '_partials'] def _get_filters_from_where(self, where_node): # Check if this is a leaf node From 2100c6372d0761a920cf22c62dffb9ed7d58c7b6 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 16:45:01 +0100 Subject: [PATCH 169/298] Moved wagtailsearch test models into wagtail.tests models --- wagtail/tests/models.py | 25 ++++ ...to__del_searchtestchild__del_searchtest.py | 112 ++++++++++++++++++ wagtail/wagtailsearch/models.py | 26 ---- wagtail/wagtailsearch/tests/test_backends.py | 4 +- 4 files changed, 139 insertions(+), 28 deletions(-) create mode 100644 wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py index ff6dc2dcc..5787c19ff 100644 --- a/wagtail/tests/models.py +++ b/wagtail/tests/models.py @@ -11,6 +11,7 @@ from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField from wagtail.wagtailsnippets.models import register_snippet +from wagtail.wagtailsearch import indexed EVENT_AUDIENCE_CHOICES = ( @@ -316,3 +317,27 @@ class BusinessSubIndex(Page): class BusinessChild(Page): subpage_types = [] + + +class SearchTest(models.Model, indexed.Indexed): + title = models.CharField(max_length=255) + content = models.TextField() + live = models.BooleanField(default=False) + + search_fields = ( + indexed.SearchField('title'), + indexed.SearchField('content'), + indexed.SearchField('callable_indexed_field'), + indexed.FilterField('live'), + ) + + def callable_indexed_field(self): + return "Callable" + + +class SearchTestChild(SearchTest): + extra_content = models.TextField() + + search_fields = SearchTest.search_fields + ( + indexed.SearchField('extra_content'), + ) diff --git a/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py b/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py new file mode 100644 index 000000000..560dbaae9 --- /dev/null +++ b/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py @@ -0,0 +1,112 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Deleting model 'SearchTestChild' + db.delete_table(u'wagtailsearch_searchtestchild') + + # Deleting model 'SearchTest' + db.delete_table(u'wagtailsearch_searchtest') + + + def backwards(self, orm): + # Adding model 'SearchTestChild' + db.create_table(u'wagtailsearch_searchtestchild', ( + ('extra_content', self.gf('django.db.models.fields.TextField')()), + (u'searchtest_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wagtailsearch.SearchTest'], unique=True, primary_key=True)), + )) + db.send_create_signal(u'wagtailsearch', ['SearchTestChild']) + + # Adding model 'SearchTest' + db.create_table(u'wagtailsearch_searchtest', ( + ('content', self.gf('django.db.models.fields.TextField')()), + ('live', self.gf('django.db.models.fields.BooleanField')(default=False)), + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), + )) + db.send_create_signal(u'wagtailsearch', ['SearchTest']) + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'wagtailcore.page': { + 'Meta': {'object_name': 'Page'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + u'wagtailsearch.editorspick': { + 'Meta': {'ordering': "('sort_order',)", 'object_name': 'EditorsPick'}, + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wagtailcore.Page']"}), + 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': u"orm['wagtailsearch.Query']"}), + 'sort_order': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + u'wagtailsearch.query': { + 'Meta': {'object_name': 'Query'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'query_string': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) + }, + u'wagtailsearch.querydailyhits': { + 'Meta': {'unique_together': "(('query', 'date'),)", 'object_name': 'QueryDailyHits'}, + 'date': ('django.db.models.fields.DateField', [], {}), + 'hits': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': u"orm['wagtailsearch.Query']"}) + } + } + + complete_apps = ['wagtailsearch'] \ No newline at end of file diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py index 7cb8546d7..c63a076a7 100644 --- a/wagtail/wagtailsearch/models.py +++ b/wagtail/wagtailsearch/models.py @@ -78,29 +78,3 @@ class EditorsPick(models.Model): class Meta: ordering = ('sort_order', ) - - -# Used for tests - -class SearchTest(models.Model, indexed.Indexed): - title = models.CharField(max_length=255) - content = models.TextField() - live = models.BooleanField(default=False) - - search_fields = ( - indexed.SearchField('title'), - indexed.SearchField('content'), - indexed.SearchField('callable_indexed_field'), - indexed.FilterField('live'), - ) - - def callable_indexed_field(self): - return "Callable" - - -class SearchTestChild(SearchTest): - extra_content = models.TextField() - - search_fields = SearchTest.search_fields + ( - indexed.SearchField('extra_content'), - ) diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index 86a67f21a..04d28689a 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -6,9 +6,9 @@ from django.conf import settings from django.core import management from wagtail.tests.utils import unittest -from wagtail.wagtailsearch import models, get_search_backend +from wagtail.tests import models +from wagtail.wagtailsearch.backends import get_search_backend, InvalidSearchBackendError from wagtail.wagtailsearch.backends.db import DBSearch -from wagtail.wagtailsearch.backends import InvalidSearchBackendError class BackendTests(object): From 2679dc2fe69fbf08423d727c19e16a19c068ffbb Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 16:51:06 +0100 Subject: [PATCH 170/298] Split up backend tests --- wagtail/wagtailsearch/tests/test_backends.py | 21 ------------------- .../wagtailsearch/tests/test_db_backend.py | 13 ++++++++++++ .../tests/test_elasticsearch_backend.py | 18 ++++++++++++++++ 3 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 wagtail/wagtailsearch/tests/test_db_backend.py create mode 100644 wagtail/wagtailsearch/tests/test_elasticsearch_backend.py diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index 04d28689a..e9b656298 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -151,27 +151,6 @@ class BackendTests(object): self.assertEqual(len(results), 3) -class TestDBBackend(BackendTests, TestCase): - backend_path = 'wagtail.wagtailsearch.backends.db.DBSearch' - - @unittest.expectedFailure - def test_callable_indexed_field(self): - super(TestDBBackend, self).test_callable_indexed_field() - - -class TestElasticSearchBackend(BackendTests, TestCase): - backend_path = 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch' - - def test_search_with_spaces_only(self): - # Search for some space characters and hope it doesn't crash - results = self.backend.search(" ", models.SearchTest) - - # Queries are lazily evaluated, force it to run - list(results) - - # Didn't crash, yay! - - @override_settings(WAGTAILSEARCH_BACKENDS={ 'default': {'BACKEND': 'wagtail.wagtailsearch.backends.db.DBSearch'} }) diff --git a/wagtail/wagtailsearch/tests/test_db_backend.py b/wagtail/wagtailsearch/tests/test_db_backend.py new file mode 100644 index 000000000..f471a34d1 --- /dev/null +++ b/wagtail/wagtailsearch/tests/test_db_backend.py @@ -0,0 +1,13 @@ +from wagtail.tests.utils import unittest + +from django.test import TestCase + +from .test_backends import BackendTests + + +class TestDBBackend(BackendTests, TestCase): + backend_path = 'wagtail.wagtailsearch.backends.db.DBSearch' + + @unittest.expectedFailure + def test_callable_indexed_field(self): + super(TestDBBackend, self).test_callable_indexed_field() diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py new file mode 100644 index 000000000..c2623fd54 --- /dev/null +++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py @@ -0,0 +1,18 @@ +from wagtail.tests.utils import unittest + +from django.test import TestCase + +from .test_backends import BackendTests + + +class TestElasticSearchBackend(BackendTests, TestCase): + backend_path = 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch' + + def test_search_with_spaces_only(self): + # Search for some space characters and hope it doesn't crash + results = self.backend.search(" ", models.SearchTest) + + # Queries are lazily evaluated, force it to run + list(results) + + # Didn't crash, yay! From f02a6937d262dcfa68ceb8e0551663799c7f9b17 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 17:31:52 +0100 Subject: [PATCH 171/298] Added more tests for ElasticSearch backend --- wagtail/tests/models.py | 15 +- .../tests/test_elasticsearch_backend.py | 347 ++++++++++++++++++ 2 files changed, 357 insertions(+), 5 deletions(-) diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py index 5787c19ff..86c85e7f9 100644 --- a/wagtail/tests/models.py +++ b/wagtail/tests/models.py @@ -323,21 +323,26 @@ class SearchTest(models.Model, indexed.Indexed): title = models.CharField(max_length=255) content = models.TextField() live = models.BooleanField(default=False) + published_date = models.DateField(null=True) - search_fields = ( - indexed.SearchField('title'), + search_fields = [ + indexed.SearchField('title', partial_match=True), indexed.SearchField('content'), indexed.SearchField('callable_indexed_field'), + indexed.FilterField('title'), indexed.FilterField('live'), - ) + indexed.FilterField('published_date'), + ] def callable_indexed_field(self): return "Callable" class SearchTestChild(SearchTest): + subtitle = models.CharField(max_length=255, null=True, blank=True) extra_content = models.TextField() - search_fields = SearchTest.search_fields + ( + search_fields = SearchTest.search_fields + [ + indexed.SearchField('subtitle', partial_match=True), indexed.SearchField('extra_content'), - ) + ] diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py index c2623fd54..88aa87f8b 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py @@ -1,7 +1,11 @@ from wagtail.tests.utils import unittest +import datetime +import json from django.test import TestCase +from django.db.models import Q +from wagtail.tests import models from .test_backends import BackendTests @@ -16,3 +20,346 @@ class TestElasticSearchBackend(BackendTests, TestCase): list(results) # Didn't crash, yay! + + def test_partial_search(self): + # Reset the index + self.backend.reset_index() + self.backend.add_type(models.SearchTest) + self.backend.add_type(models.SearchTestChild) + + # Add some test data + obj = models.SearchTest() + obj.title = "HelloWorld" + obj.live = True + obj.save() + self.backend.add(obj) + + # Refresh the index + self.backend.refresh_index() + + # Search and check + results = self.backend.search("HelloW", models.SearchTest.objects.all()) + + self.assertEqual(len(results), 1) + self.assertEqual(results[0].id, obj.id) + + def test_child_partial_search(self): + # Reset the index + self.backend.reset_index() + self.backend.add_type(models.SearchTest) + self.backend.add_type(models.SearchTestChild) + + obj = models.SearchTestChild() + obj.title = "WorldHello" + obj.subtitle = "HelloWorld" + obj.live = True + obj.save() + self.backend.add(obj) + + # Refresh the index + self.backend.refresh_index() + + # Search and check + results = self.backend.search("HelloW", models.SearchTest.objects.all()) + + self.assertEqual(len(results), 1) + self.assertEqual(results[0].id, obj.id) + + +class TestElasticSearchQuery(TestCase): + def assertDictEqual(self, a, b): + default = self.JSONSerializer().default + self.assertEqual(json.dumps(a, sort_keys=True, default=default), json.dumps(b, sort_keys=True, default=default)) + + def setUp(self): + # Import using a try-catch block to prevent crashes if the elasticsearch-py + # module is not installed + try: + from wagtail.wagtailsearch.backends.elasticsearch import ElasticSearchQuery + from elasticsearch.serializer import JSONSerializer + except ImportError: + raise unittest.SkipTest("elasticsearch-py not installed") + + self.ElasticSearchQuery = ElasticSearchQuery + self.JSONSerializer = JSONSerializer + + def test_simple(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_none_query_string(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.all(), None) + + # Check it + expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'match_all': {}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_filter(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title="Test"), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_and_filter(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title="Test", live=True), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'and': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_or_filter(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(Q(title="Test") | Q(live=True)), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'title_filter': 'Test'}}, {'term': {'live_filter': True}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_negated_filter(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.exclude(live=True), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'term': {'live_filter': True}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_fields(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello", fields=['title']) + + # Check it + expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'query_string': {'query': 'Hello', 'fields': ['title']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_exact_lookup(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__exact="Test"), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_none_lookup(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title=None), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_isnull_true_lookup(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__isnull=True), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_isnull_false_lookup(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__isnull=False), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'missing': {'field': 'title_filter'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_startswith_lookup(self): + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__startswith="Test"), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'prefix': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_gt_lookup(self): + # This shares the same code path as gte, lt and lte so theres no need to test those + # This also tests conversion of python dates to strings + + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__gt=datetime.datetime(2014, 4, 29)), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gt': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + def test_range_lookup(self): + start_date = datetime.datetime(2014, 4, 29) + end_date = datetime.datetime(2014, 8, 19) + + # Create a query + query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__range=(start_date, end_date)), "Hello") + + # Check it + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29', 'lte': '2014-08-19'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query.to_es(), expected_result) + + +class TestElasticSearchMapping(TestCase): + def assertDictEqual(self, a, b): + default = self.JSONSerializer().default + self.assertEqual(json.dumps(a, sort_keys=True, default=default), json.dumps(b, sort_keys=True, default=default)) + + def setUp(self): + # Import using a try-catch block to prevent crashes if the elasticsearch-py + # module is not installed + try: + from wagtail.wagtailsearch.backends.elasticsearch import ElasticSearchMapping + from elasticsearch.serializer import JSONSerializer + except ImportError: + raise unittest.SkipTest("elasticsearch-py not installed") + + self.JSONSerializer = JSONSerializer + + # Create ES mapping + self.es_mapping = ElasticSearchMapping(models.SearchTest) + + # Create ES document + self.obj = models.SearchTest(title="Hello") + self.obj.save() + + def test_get_document_type(self): + self.assertEqual(self.es_mapping.get_document_type(), 'tests_searchtest') + + def test_get_mapping(self): + # Build mapping + mapping = self.es_mapping.get_mapping() + + # Check + expected_result = { + 'tests_searchtest': { + 'properties': { + 'pk': {'index': 'not_analyzed', 'type': 'string', 'store': 'yes', 'include_in_all': False}, + 'content_type': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False}, + '_partials': {'analyzer': 'edgengram_analyzer', 'include_in_all': False, 'type': 'string'}, + 'live_filter': {'index': 'not_analyzed', 'type': 'boolean', 'include_in_all': False}, + 'published_date_filter': {'index': 'not_analyzed', 'type': 'date', 'include_in_all': False}, + 'title': {'type': 'string', 'include_in_all': True, 'analyzer': 'edgengram_analyzer'}, + 'title_filter': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False}, + 'content': {'type': 'string', 'include_in_all': True}, + 'callable_indexed_field': {'type': 'string', 'include_in_all': True} + } + } + } + + self.assertDictEqual(mapping, expected_result) + + def test_get_document_id(self): + self.assertEqual(self.es_mapping.get_document_id(self.obj), 'tests_searchtest:' + str(self.obj.pk)) + + def test_get_document(self): + # Get document + document = self.es_mapping.get_document(self.obj) + + # Check + expected_result = { + 'pk': str(self.obj.pk), + 'content_type': 'tests_searchtest', + '_partials': ['Hello'], + 'live_filter': False, + 'published_date_filter': None, + 'title': 'Hello', + 'title_filter': 'Hello', + 'callable_indexed_field': 'Callable', + 'content': '', + } + + self.assertDictEqual(document, expected_result) + + +class TestElasticSearchMappingInheritance(TestCase): + def assertDictEqual(self, a, b): + default = self.JSONSerializer().default + self.assertEqual(json.dumps(a, sort_keys=True, default=default), json.dumps(b, sort_keys=True, default=default)) + + def setUp(self): + # Import using a try-catch block to prevent crashes if the elasticsearch-py + # module is not installed + try: + from wagtail.wagtailsearch.backends.elasticsearch import ElasticSearchMapping + from elasticsearch.serializer import JSONSerializer + except ImportError: + raise unittest.SkipTest("elasticsearch-py not installed") + + self.JSONSerializer = JSONSerializer + + # Create ES mapping + self.es_mapping = ElasticSearchMapping(models.SearchTestChild) + + # Create ES document + self.obj = models.SearchTestChild(title="Hello", subtitle="World") + self.obj.save() + + def test_get_document_type(self): + self.assertEqual(self.es_mapping.get_document_type(), 'tests_searchtest_tests_searchtestchild') + + def test_get_mapping(self): + # Build mapping + mapping = self.es_mapping.get_mapping() + + # Check + expected_result = { + 'tests_searchtest_tests_searchtestchild': { + 'properties': { + # New + 'extra_content': {'type': 'string', 'include_in_all': True}, + 'subtitle': {'type': 'string', 'include_in_all': True, 'analyzer': 'edgengram_analyzer'}, + + # Inherited + 'pk': {'index': 'not_analyzed', 'type': 'string', 'store': 'yes', 'include_in_all': False}, + 'content_type': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False}, + '_partials': {'analyzer': 'edgengram_analyzer', 'include_in_all': False, 'type': 'string'}, + 'live_filter': {'index': 'not_analyzed', 'type': 'boolean', 'include_in_all': False}, + 'published_date_filter': {'index': 'not_analyzed', 'type': 'date', 'include_in_all': False}, + 'title': {'type': 'string', 'include_in_all': True, 'analyzer': 'edgengram_analyzer'}, + 'title_filter': {'index': 'not_analyzed', 'type': 'string', 'include_in_all': False}, + 'content': {'type': 'string', 'include_in_all': True}, + 'callable_indexed_field': {'type': 'string', 'include_in_all': True} + } + } + } + + self.assertDictEqual(mapping, expected_result) + + def test_get_document_id(self): + # This must be tests_searchtest instead of 'tests_searchtest_tests_searchtestchild' + # as it uses the contents base content type name. + # This prevents the same object being accidentally indexed twice. + self.assertEqual(self.es_mapping.get_document_id(self.obj), 'tests_searchtest:' + str(self.obj.pk)) + + def test_get_document(self): + # Build document + document = self.es_mapping.get_document(self.obj) + + # Sort partials + if '_partials' in document: + document['_partials'].sort() + + # Check + expected_result = { + # New + 'extra_content': '', + 'subtitle': 'World', + + # Changed + 'content_type': 'tests_searchtest_tests_searchtestchild', + + # Inherited + 'pk': str(self.obj.pk), + '_partials': ['Hello', 'World'], + 'live_filter': False, + 'published_date_filter': None, + 'title': 'Hello', + 'title_filter': 'Hello', + 'callable_indexed_field': 'Callable', + 'content': '', + } + + self.assertDictEqual(document, expected_result) From 04c507e37be80b9ba5b88fdc6140acdad43f3ed3 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 18:25:42 +0100 Subject: [PATCH 172/298] Added tests for indexed class --- wagtail/tests/models.py | 28 +++++++++++ .../wagtailsearch/tests/test_indexed_class.py | 49 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 wagtail/wagtailsearch/tests/test_indexed_class.py diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py index 86c85e7f9..504648933 100644 --- a/wagtail/tests/models.py +++ b/wagtail/tests/models.py @@ -346,3 +346,31 @@ class SearchTestChild(SearchTest): indexed.SearchField('subtitle', partial_match=True), indexed.SearchField('extra_content'), ] + + +class SearchTestOldConfig(models.Model, indexed.Indexed): + """ + This tests that the Indexed class can correctly handle models that + use the old "indexed_fields" configuration format. + """ + indexed_fields = { + # A search field with predictive search and boosting + 'title': { + 'type': 'string', + 'analyzer': 'edgengram_analyzer', + 'boost': 100, + }, + + # A filter field + 'live': { + 'type': 'boolean', + 'index': 'not_analyzed', + }, + } + +class SearchTestOldConfigList(models.Model, indexed.Indexed): + """ + This tests that the Indexed class can correctly handle models that + use the old "indexed_fields" configuration format using a list. + """ + indexed_fields = ['title', 'content'] diff --git a/wagtail/wagtailsearch/tests/test_indexed_class.py b/wagtail/wagtailsearch/tests/test_indexed_class.py new file mode 100644 index 000000000..a54f135c3 --- /dev/null +++ b/wagtail/wagtailsearch/tests/test_indexed_class.py @@ -0,0 +1,49 @@ +from django.test import TestCase +from wagtail.tests import models +import json + +from wagtail.wagtailsearch import indexed + + +class TestContentTypeNames(TestCase): + def test_base_content_type_name(self): + name = models.SearchTestChild.indexed_get_toplevel_content_type() + self.assertEqual(name, 'tests_searchtest') + + def test_qualified_content_type_name(self): + name = models.SearchTestChild.indexed_get_content_type() + self.assertEqual(name, 'tests_searchtest_tests_searchtestchild') + + +class TestIndexedFieldsBackwardsCompatibility(TestCase): + def test_indexed_fields_backwards_compatibility(self): + # Get search fields + search_fields = models.SearchTestOldConfig.get_search_fields() + + search_fields_dict = dict( + ((field.field_name, type(field)), field) + for field in search_fields + ) + + # Check that the fields were found + self.assertEqual(len(search_fields_dict), 2) + self.assertIn(('title', indexed.SearchField), search_fields_dict.keys()) + self.assertIn(('live', indexed.FilterField), search_fields_dict.keys()) + + # Check that the title field has the correct settings + self.assertTrue(search_fields_dict[('title', indexed.SearchField)].partial_match) + self.assertEqual(search_fields_dict[('title', indexed.SearchField)].boost, 100) + + def test_indexed_fields_backwards_compatibility_list(self): + # Get search fields + search_fields = models.SearchTestOldConfigList.get_search_fields() + + search_fields_dict = dict( + ((field.field_name, type(field)), field) + for field in search_fields + ) + + # Check that the fields were found + self.assertEqual(len(search_fields_dict), 2) + self.assertIn(('title', indexed.SearchField), search_fields_dict.keys()) + self.assertIn(('content', indexed.SearchField), search_fields_dict.keys()) From 9938ecf9607f14519b46af22b247e0c611266c8a Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 3 Jul 2014 12:11:34 +0100 Subject: [PATCH 173/298] add py32-dj16-sqlite to the list of tox environments that fail due to iteritems in South --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 8ffd0ef60..2b17c65ba 100644 --- a/tox.ini +++ b/tox.ini @@ -21,6 +21,7 @@ envlist = # py27-dj16-mysql # South fails with sqlite on python3, because it tries to use DryRunMigrator which uses iteritems +# py32-dj16-sqlite, # py33-dj16-sqlite, # py34-dj16-sqlite From cd14be23c3361d334f7a9367b1cad3ab45880054 Mon Sep 17 00:00:00 2001 From: Tom Talbot Date: Thu, 3 Jul 2014 12:22:44 +0100 Subject: [PATCH 174/298] Tweak FieldPanel tests --- wagtail/wagtailadmin/tests/test_edit_handlers.py | 6 +++--- wagtail/wagtailsnippets/tests.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index fa9f3f650..d5af430eb 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -186,15 +186,15 @@ class TestFieldPanel(TestCase): self.assertEqual(self.field_panel.field_type(), 'fake_class') def test_widget_overrides(self): - result = self.field_panel.widget_overrides() + result = FieldPanel.widget_overrides() self.assertEqual(result, {}) def test_required_formsets(self): - result = self.field_panel.required_formsets() + result = FieldPanel.required_formsets() self.assertEqual(result, []) def test_get_form_class(self): - result = self.field_panel.get_form_class(Page) + result = FieldPanel.get_form_class(Page) self.assertTrue(issubclass(result, WagtailAdminModelForm)) def test_render_js(self): diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 29a0ae284..61bf9baaf 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -5,9 +5,12 @@ from wagtail.tests.utils import WagtailTestUtils from wagtail.tests.models import Advert, AlphaSnippet, ZuluSnippet from wagtail.wagtailsnippets.models import register_snippet, SNIPPET_MODELS -from wagtail.wagtailsnippets.views.snippets import get_content_type_from_url_params, get_snippet_edit_handler +from wagtail.wagtailsnippets.views.snippets import ( + get_snippet_edit_handler +) from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel + class TestSnippetIndexView(TestCase, WagtailTestUtils): def setUp(self): self.login() From 2f126bda6e3f620c0927a10b8676bedc9e46600c Mon Sep 17 00:00:00 2001 From: Neal Todd Date: Thu, 3 Jul 2014 12:26:48 +0100 Subject: [PATCH 175/298] Update index.rst --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index c96e77f10..ae2300556 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,7 +3,7 @@ Welcome to Wagtail's documentation Wagtail is a modern, flexible CMS, built on Django. -It supports Django 1.6.2+ on Python 2.6, 2.7, 3.3 and 3.4. Django 1.7 support is in progress pending further release candidate testing. +It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 support is in progress pending further release candidate testing. .. toctree:: :maxdepth: 3 From 63e5ca34ce9ad6b9bd1229a207767a51a76328e9 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 12:31:18 +0100 Subject: [PATCH 176/298] Make sure field filters are sorted before checking them --- .../tests/test_elasticsearch_backend.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py index 88aa87f8b..0c7906b39 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py @@ -113,15 +113,26 @@ class TestElasticSearchQuery(TestCase): # Check it expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'and': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} - self.assertDictEqual(query.to_es(), expected_result) + + # Make sure field filters are sorted (as they can be in any order which may cause false positives) + query = query.to_es() + field_filters = query['filtered']['filter']['and'][1]['and'] + field_filters[:] = sorted(field_filters, key=lambda f: list(f['term'].keys())[0]) + + self.assertDictEqual(query, expected_result) def test_or_filter(self): # Create a query query = self.ElasticSearchQuery(models.SearchTest.objects.filter(Q(title="Test") | Q(live=True)), "Hello") + # Make sure field filters are sorted (as they can be in any order which may cause false positives) + query = query.to_es() + field_filters = query['filtered']['filter']['and'][1]['or'] + field_filters[:] = sorted(field_filters, key=lambda f: list(f['term'].keys())[0]) + # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'title_filter': 'Test'}}, {'term': {'live_filter': True}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} - self.assertDictEqual(query.to_es(), expected_result) + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + self.assertDictEqual(query, expected_result) def test_negated_filter(self): # Create a query From 001fcabb46e986f5be8bbe0c4b2e61cd14507d10 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 12:44:53 +0100 Subject: [PATCH 177/298] Fixed python 3.2 incompatible migration --- ...to__del_searchtestchild__del_searchtest.py | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py b/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py index 560dbaae9..6826ddaa1 100644 --- a/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py +++ b/wagtail/wagtailsearch/migrations/0003_auto__del_searchtestchild__del_searchtest.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + from south.utils import datetime_utils as datetime from south.db import db from south.v2 import SchemaMigration @@ -9,76 +11,76 @@ class Migration(SchemaMigration): def forwards(self, orm): # Deleting model 'SearchTestChild' - db.delete_table(u'wagtailsearch_searchtestchild') + db.delete_table('wagtailsearch_searchtestchild') # Deleting model 'SearchTest' - db.delete_table(u'wagtailsearch_searchtest') + db.delete_table('wagtailsearch_searchtest') def backwards(self, orm): # Adding model 'SearchTestChild' - db.create_table(u'wagtailsearch_searchtestchild', ( + db.create_table('wagtailsearch_searchtestchild', ( ('extra_content', self.gf('django.db.models.fields.TextField')()), - (u'searchtest_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wagtailsearch.SearchTest'], unique=True, primary_key=True)), + ('searchtest_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['wagtailsearch.SearchTest'], unique=True, primary_key=True)), )) - db.send_create_signal(u'wagtailsearch', ['SearchTestChild']) + db.send_create_signal('wagtailsearch', ['SearchTestChild']) # Adding model 'SearchTest' - db.create_table(u'wagtailsearch_searchtest', ( + db.create_table('wagtailsearch_searchtest', ( ('content', self.gf('django.db.models.fields.TextField')()), ('live', self.gf('django.db.models.fields.BooleanField')(default=False)), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('title', self.gf('django.db.models.fields.CharField')(max_length=255)), )) - db.send_create_signal(u'wagtailsearch', ['SearchTest']) + db.send_create_signal('wagtailsearch', ['SearchTest']) models = { - u'auth.group': { + 'auth.group': { 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - u'auth.user': { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) }, - u'contenttypes.contenttype': { + 'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - u'wagtailcore.page': { + 'wagtailcore.page': { 'Meta': {'object_name': 'Page'}, - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['contenttypes.ContentType']"}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['auth.User']"}), 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), @@ -87,25 +89,25 @@ class Migration(SchemaMigration): 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) }, - u'wagtailsearch.editorspick': { + 'wagtailsearch.editorspick': { 'Meta': {'ordering': "('sort_order',)", 'object_name': 'EditorsPick'}, 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['wagtailcore.Page']"}), - 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': u"orm['wagtailsearch.Query']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['wagtailcore.Page']"}), + 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editors_picks'", 'to': "orm['wagtailsearch.Query']"}), 'sort_order': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) }, - u'wagtailsearch.query': { + 'wagtailsearch.query': { 'Meta': {'object_name': 'Query'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'query_string': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) }, - u'wagtailsearch.querydailyhits': { + 'wagtailsearch.querydailyhits': { 'Meta': {'unique_together': "(('query', 'date'),)", 'object_name': 'QueryDailyHits'}, 'date': ('django.db.models.fields.DateField', [], {}), 'hits': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': u"orm['wagtailsearch.Query']"}) + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'query': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'daily_hits'", 'to': "orm['wagtailsearch.Query']"}) } } From 08ced063ff09d102922deaf279275e4c0fb5ff4d Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 18:56:08 +0100 Subject: [PATCH 178/298] Moved search method into base search backend --- wagtail/wagtailcore/models.py | 2 +- wagtail/wagtailsearch/backends/base.py | 38 ++++++++++++++++++- wagtail/wagtailsearch/backends/db.py | 34 +++++------------ .../wagtailsearch/backends/elasticsearch.py | 34 +---------------- 4 files changed, 48 insertions(+), 60 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 4964966a3..b6a664548 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -514,7 +514,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, indexed.Index # Search s = get_search_backend() - return s.search(query_string, model=cls, fields=fields, filters=filters, prefetch_related=prefetch_related) + return s.search(query_string, cls, fields=fields, filters=filters, prefetch_related=prefetch_related) @classmethod def clean_subpage_types(cls): diff --git a/wagtail/wagtailsearch/backends/base.py b/wagtail/wagtailsearch/backends/base.py index 393ecae1b..82e2e8d56 100644 --- a/wagtail/wagtailsearch/backends/base.py +++ b/wagtail/wagtailsearch/backends/base.py @@ -1,6 +1,9 @@ from django.db import models +from django.db.models.query import QuerySet +from django.core.exceptions import ImproperlyConfigured from wagtail.wagtailsearch.indexed import Indexed +from wagtail.wagtailsearch.utils import normalise_query_string class BaseSearch(object): @@ -32,5 +35,38 @@ class BaseSearch(object): def delete(self, obj): return NotImplemented - def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]): + def _search(self, queryset, query_string, fields=None): return NotImplemented + + def search(self, query_string, model_or_queryset, fields=None, filters=None, prefetch_related=None): + # Find model/queryset + if isinstance(model_or_queryset, QuerySet): + model = model_or_queryset.model + queryset = model_or_queryset + else: + model = model_or_queryset + queryset = model_or_queryset.objects.all() + + # Model must be a descendant of Indexed and be a django model + if not issubclass(model, Indexed) or not issubclass(model, models.Model): + return [] + + # Normalise query string + if query_string is not None: + query_string = normalise_query_string(query_string) + + # Check that theres still a query string after the clean up + if query_string == "": + return [] + + # Apply filters to queryset + if filters: + queryset = queryset.filter(**filters) + + # Prefetch related + if prefetch_related: + for prefetch in prefetch_related: + queryset = queryset.prefetch_related(prefetch) + + # Search + return self._search(queryset, query_string, fields=fields) diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py index 56536e343..a94fe3c58 100644 --- a/wagtail/wagtailsearch/backends/db.py +++ b/wagtail/wagtailsearch/backends/db.py @@ -2,7 +2,6 @@ from django.db import models from wagtail.wagtailsearch.backends.base import BaseSearch from wagtail.wagtailsearch.indexed import Indexed -from wagtail.wagtailsearch.utils import normalise_query_string class DBSearch(BaseSearch): @@ -27,26 +26,16 @@ class DBSearch(BaseSearch): def delete(self, obj): pass # Not needed - def search(self, query_string, model, fields=None, filters=None, prefetch_related=None): - # Get fields - if fields is None: - fields = [field.field_name for field in model.get_searchable_search_fields()] - - # Start with all objects - query = model.objects.all() - - # Apply filters - if filters: - query = query.filter(**filters) - + def _search(self, queryset, query_string, fields=None): if query_string is not None: - # Normalise query string - query_string = normalise_query_string(query_string) + # Get fields + if fields is None: + fields = [field.field_name for field in queryset.model.get_searchable_search_fields()] # Get terms terms = query_string.split() if not terms: - return model.objects.none() + return queryset.model.objects.none() # Filter by terms for term in terms: @@ -54,21 +43,16 @@ class DBSearch(BaseSearch): for field_name in fields: # Check if the field exists (this will filter out indexed callables) try: - model._meta.get_field_by_name(field_name) + queryset.model._meta.get_field_by_name(field_name) except: continue # Filter on this field term_query |= models.Q(**{'%s__icontains' % field_name: term}) - query = query.filter(term_query) + queryset = queryset.filter(term_query) # Distinct - query = query.distinct() + queryset = queryset.distinct() - # Prefetch related - if prefetch_related: - for prefetch in prefetch_related: - query = query.prefetch_related(prefetch) - - return query + return queryset diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index ea0413eed..8f17ba6ce 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -3,14 +3,12 @@ from __future__ import absolute_import import json from django.db import models -from django.db.models.query import QuerySet from elasticsearch import Elasticsearch, NotFoundError, RequestError from elasticsearch.helpers import bulk from wagtail.wagtailsearch.backends.base import BaseSearch from wagtail.wagtailsearch.indexed import Indexed, SearchField, FilterField -from wagtail.wagtailsearch.utils import normalise_query_string class ElasticSearchMapping(object): @@ -576,35 +574,5 @@ class ElasticSearch(BaseSearch): except NotFoundError: pass # Document doesn't exist, ignore this exception - def search(self, query_string, model_or_queryset, fields=None, filters=None, prefetch_related=None): - # Find model/queryset - if isinstance(model_or_queryset, QuerySet): - model = model_or_queryset.model - queryset = model_or_queryset - else: - model = model_or_queryset - queryset = model_or_queryset.objects.all() - - # Model must be a descendant of Indexed and be a django model - if not issubclass(model, Indexed) or not issubclass(model, models.Model): - return [] - - # Normalise query string - if query_string is not None: - query_string = normalise_query_string(query_string) - - # Check that theres still a query string after the clean up - if query_string == "": - return [] - - # Apply filters to queryset - if filters: - queryset = queryset.filter(**filters) - - # Prefetch related - if prefetch_related: - for prefetch in prefetch_related: - queryset = queryset.prefetch_related(prefetch) - - # Return search results + def _search(self, queryset, query_string, fields=None): return ElasticSearchResults(self, ElasticSearchQuery(queryset, query_string, fields=fields)) From e35e20dd10e2be669addbde992b24b41d78d9f5a Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 19:14:46 +0100 Subject: [PATCH 179/298] Added search method to PageQuerySet --- wagtail/wagtailcore/models.py | 3 +++ wagtail/wagtailcore/query.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index b6a664548..daee31fb3 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -228,6 +228,9 @@ class PageManager(models.Manager): def not_type(self, model): return self.get_queryset().not_type(model) + def search(self, query_string, fields=None, backend='default'): + return self.get_queryset().search(query_string, fields=fields, backend=backend) + class PageBase(models.base.ModelBase): """Metaclass for Page""" diff --git a/wagtail/wagtailcore/query.py b/wagtail/wagtailcore/query.py index 57e8ffff3..422e46f47 100644 --- a/wagtail/wagtailcore/query.py +++ b/wagtail/wagtailcore/query.py @@ -2,6 +2,8 @@ from django.db.models import Q from django.contrib.contenttypes.models import ContentType from treebeard.mp_tree import MP_NodeQuerySet +from wagtail.wagtailsearch.backends import get_search_backend + class PageQuerySet(MP_NodeQuerySet): """ @@ -107,3 +109,7 @@ class PageQuerySet(MP_NodeQuerySet): def not_type(self, model): return self.exclude(self.type_q(model)) + + def search(self, query_string, fields=None, backend='default'): + search_backend = get_search_backend(backend) + return search_backend.search(query_string, self, fields=None) From b78b6486829f748daf42d6240426abb44d8329a5 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 21:07:09 +0100 Subject: [PATCH 180/298] Implemented __in lookup in ElasticSearch backend Also added an error message if a user attempts to use a subquery with the __in lookup. --- wagtail/wagtailsearch/backends/elasticsearch.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 8f17ba6ce..289b0f4b2 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -3,6 +3,7 @@ from __future__ import absolute_import import json from django.db import models +from django.db.models.sql.where import SubqueryConstraint from elasticsearch import Elasticsearch, NotFoundError, RequestError from elasticsearch.helpers import bulk @@ -201,7 +202,16 @@ class ElasticSearchQuery(object): } } - raise FilterError('Could not apply filter on ElasticSearch results "' + field_name + '__' + lookup + ' = ' + unicode(value) + '". Lookup "' + lookup + '"" not recognosed.') + if lookup == 'in': + return { + 'terms': { + field_index_name: value, + } + } + + raise FilterError('Could not apply filter on ElasticSearch results: "' + field_name + '__' + lookup + ' = ' + unicode(value) + '". Lookup "' + lookup + '"" not recognosed.') + elif isinstance(where_node, SubqueryConstraint): + raise FilterError('Could not apply filter on ElasticSearch results: Subqueries are not allowed.') # Get child filters connector = where_node.connector From 9e1bd2d601ab540eb0d2d383ddeec369ef7c94c1 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 24 Jun 2014 14:27:40 +0100 Subject: [PATCH 181/298] Added get_indexed_objects method to Indexed class This gives developers control over the QuerySet used when the model is added to the indexed --- wagtail/wagtailsearch/indexed.py | 4 ++++ wagtail/wagtailsearch/management/commands/update_index.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailsearch/indexed.py b/wagtail/wagtailsearch/indexed.py index a2cb54d14..2e506d690 100644 --- a/wagtail/wagtailsearch/indexed.py +++ b/wagtail/wagtailsearch/indexed.py @@ -118,6 +118,10 @@ class Indexed(object): def get_filterable_search_fields(cls): return filter(lambda field: isinstance(field, FilterField), cls.get_search_fields()) + @classmethod + def get_indexed_objects(cls): + return cls.objects.all() + indexed_fields = () diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py index 2c1593635..c52b75639 100644 --- a/wagtail/wagtailsearch/management/commands/update_index.py +++ b/wagtail/wagtailsearch/management/commands/update_index.py @@ -24,7 +24,7 @@ class Command(BaseCommand): toplevel_content_type = model.indexed_get_toplevel_content_type() # Loop through objects - for obj in model.objects.all(): + for obj in model.get_indexed_objects(): # Get key for this object key = toplevel_content_type + ':' + str(obj.pk) From b9d3e44ebf1b146987338c137c9bb867a81f52fd Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 24 Jun 2014 14:28:40 +0100 Subject: [PATCH 182/298] Use get_indexed_objects to speed up indexing of Images/Documents Previously, this created a query for every single image and document to get the tags. This was very slow on RCA which has over 15000 images. This commit fixes this by adding a prefetch_related to the QuerySet used for indexing. --- wagtail/wagtailadmin/taggable.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/taggable.py b/wagtail/wagtailadmin/taggable.py index 91c36ca7f..3b7de479c 100644 --- a/wagtail/wagtailadmin/taggable.py +++ b/wagtail/wagtailadmin/taggable.py @@ -21,7 +21,11 @@ class TagSearchable(indexed.Indexed): @property def get_tags(self): - return ' '.join([tag.name for tag in self.tags.all()]) + return ' '.join([tag.name for tag in self.prefetched_tags()]) + + @classmethod + def get_indexed_objects(cls): + return super(TagSearchable, cls).get_indexed_objects().prefetch_related('tagged_items__tag') @classmethod def search(cls, q, results_per_page=None, page=1, prefetch_tags=False, filters={}): From 00347ff6ba0bd75cb22d460f6e67dcac4dcbe750 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 12:53:11 +0100 Subject: [PATCH 183/298] Rearrange static site generation docs --- docs/static_site_generation.rst | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/static_site_generation.rst b/docs/static_site_generation.rst index a9379cd67..9feb59c36 100644 --- a/docs/static_site_generation.rst +++ b/docs/static_site_generation.rst @@ -25,8 +25,19 @@ Then add ``django_medusa`` and ``wagtail.contrib.wagtailmedusa`` to ``INSTALLED_ ] +Rendering +~~~~~~~~~ + +To render a site, run ``./manage.py staticsitegen``. This will render the entire website and place the HTML in a folder called 'medusa_output'. The static and media folders need to be copied into this folder manually after the rendering is complete. This feature inherits django-medusa's ability to render your static site to Amazon S3 or Google App Engine; see the `medusa docs `_ for configuration details. + +To test, open the 'medusa_output' folder in a terminal and run ``python -m SimpleHTTPServer``. + + +Advanced topics +~~~~~~~~~~~~~~~ + Replacing GET parameters with custom routing -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-------------------------------------------- Pages which require GET parameters (e.g. for pagination) don't generate suitable filenames for generated HTML files so they need to be changed to use custom routing instead. @@ -51,7 +62,7 @@ For example, let's say we have a Blog Index which uses pagination. We can overri Rendering pages which use custom routing -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +---------------------------------------- For page types that override the ``route`` method, we need to let django medusa know which URLs it responds on. This is done by overriding the ``get_static_site_paths`` method to make it yield one string per URL path. @@ -72,12 +83,4 @@ For example, the BlogIndex above would need to yield one URL for each page of re yield path -Rendering -~~~~~~~~~ - -To render a site, run ``./manage.py staticsitegen``. This will render the entire website and place the HTML in a folder called 'medusa_output'. The static and media folders need to be copied into this folder manually after the rendering is complete. This feature inherits django-medusa's ability to render your static site to Amazon S3 or Google App Engine; see the `medusa docs `_ for configuration details. - -To test, open the 'medusa_output' folder in a terminal and run ``python -m SimpleHTTPServer``. - - .. _django medusa: https://github.com/mtigas/django-medusa From 25e92493080722527c7995621065e2e6644ed3f8 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 13:06:23 +0100 Subject: [PATCH 184/298] Added a couple of missing python version classifiers --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index ec59a5b45..6e0bc6949 100644 --- a/setup.py +++ b/setup.py @@ -66,6 +66,8 @@ setup( 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Framework :: Django', From 3dc83a961f06f486be422148e25a99c6afe055ba Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 13:07:18 +0100 Subject: [PATCH 185/298] Updated changelog --- CHANGELOG.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 66fad83d8..8f391a29a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,7 +4,7 @@ Changelog 0.4 (xx.xx.20xx) ~~~~~~~~~~~~~~~~ * ElasticUtils/pyelasticsearch swapped for elasticsearch-py - * Python 3.3 and 3.4 support + * Python 3.2, 3.3 and 3.4 support * Added scheduled publishing * Added frontend cache invalidator * Added sitemap generator @@ -28,6 +28,7 @@ Changelog * Added 'get_next_siblings' and 'get_prev_siblings' to Page * Added init_new_page signal * Added page_published signal + * Added copy method to Page to allow copying of pages * Fix: Animated GIFs are now coalesced before resizing * Fix: Wand backend clones images before modifying them * Fix: Admin breadcrumb now positioned correctly on mobile From c9385ca1ce241ff15f88faa262800ae561098d58 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 13:10:03 +0100 Subject: [PATCH 186/298] frontend cache purge docs change --- docs/frontend_cache_purging.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/frontend_cache_purging.rst b/docs/frontend_cache_purging.rst index e8564f6c1..34a6fda50 100644 --- a/docs/frontend_cache_purging.rst +++ b/docs/frontend_cache_purging.rst @@ -107,9 +107,11 @@ Purging individual URLs ``wagtail.contrib.wagtailfrontendcache.utils`` provides another utils function called ``purge_url_from_cache``. As the name suggests, this purges an individual URL from the cache. +For example, this could be useful for purging a single page of blogs: + .. code-block:: python from wagtail.contrib.wagtailfrontendcache.utils import purge_url_from_cache - # Purge the homepage - purge_url_from_cache(homepage.full_url) + # Purge the first page of the blog index + purge_url_from_cache(blog_index.url + '?page=1') From 735cfe376728047d9a168d2282e8f7ce954e044f Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 13:44:11 +0100 Subject: [PATCH 187/298] Use UTC timezone in tests This prevents Django from converting times in tests --- runtests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/runtests.py b/runtests.py index c911377f1..20b4512fa 100755 --- a/runtests.py +++ b/runtests.py @@ -43,6 +43,7 @@ if not settings.configured: STATIC_ROOT=STATIC_ROOT, MEDIA_ROOT=MEDIA_ROOT, USE_TZ=True, + TIME_ZONE='UTC', STATICFILES_FINDERS=( 'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'compressor.finders.CompressorFinder', From 69077927f9a7132a5e7f1a8e19b7423648abb21b Mon Sep 17 00:00:00 2001 From: Tom Talbot Date: Thu, 3 Jul 2014 13:56:43 +0100 Subject: [PATCH 188/298] Fix FieldPanel test failures --- wagtail/wagtailadmin/tests/test_edit_handlers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index d5af430eb..30fda39a5 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -186,15 +186,15 @@ class TestFieldPanel(TestCase): self.assertEqual(self.field_panel.field_type(), 'fake_class') def test_widget_overrides(self): - result = FieldPanel.widget_overrides() + result = FieldPanel('barbecue', 'snowman').widget_overrides() self.assertEqual(result, {}) def test_required_formsets(self): - result = FieldPanel.required_formsets() + result = FieldPanel('barbecue', 'snowman').required_formsets() self.assertEqual(result, []) def test_get_form_class(self): - result = FieldPanel.get_form_class(Page) + result = FieldPanel('barbecue', 'snowman').get_form_class(Page) self.assertTrue(issubclass(result, WagtailAdminModelForm)) def test_render_js(self): From c0cb1b62806f3b81d2410d1d8382b32922c2619f Mon Sep 17 00:00:00 2001 From: Tom Talbot Date: Thu, 3 Jul 2014 14:11:29 +0100 Subject: [PATCH 189/298] Remove mock expected calls from edit handler tests 'Expected calls' works differently in Python 2 and 3 --- wagtail/wagtailadmin/tests/test_edit_handlers.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index 30fda39a5..48e24aff2 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -357,8 +357,6 @@ class TestInlinePanel(TestCase): form=self.fake_field) result = inline_panel.get_panel_definitions() self.assertEqual(result[0].name, 'mock panel') - expected_calls = '[call(instance=fake instance, form=fake form),\n call(instance=fake instance, form=fake form)]' - self.assertEqual(str(self.mock_panel.mock_calls), expected_calls) def test_get_panel_definitions(self): """ @@ -374,8 +372,6 @@ class TestInlinePanel(TestCase): form=self.fake_field) result = inline_panel.get_panel_definitions() self.assertEqual(result[0].name, 'other mock panel') - expected_calls = '[call(instance=fake instance, form=fake form),\n call(instance=fake instance, form=fake form)]' - self.assertEqual(str(other_mock_panel.mock_calls), expected_calls) def test_required_formsets(self): inline_panel = InlinePanel(self.mock_model, 'formset')( From 532bb6241e7cbced94fb044306e3eba7a447be82 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 14:26:05 +0100 Subject: [PATCH 190/298] Added some more FilterFields to Page --- wagtail/wagtailcore/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index daee31fb3..75021d584 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -285,8 +285,12 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, indexed.Index search_fields = ( indexed.SearchField('title', partial_match=True, boost=100), + indexed.FilterField('id'), indexed.FilterField('live'), + indexed.FilterField('owner'), + indexed.FilterField('content_type'), indexed.FilterField('path'), + indexed.FilterField('depth'), ) def __init__(self, *args, **kwargs): From dd52ccab2aa41f8410da18ee0b26d99e3adb87a3 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 12 Jun 2014 13:03:46 +0100 Subject: [PATCH 191/298] Remove X-Requested-With header hacks on the incoming requests to preview_on_edit and preview_on_create - no longer necessary, because we're not passing that request to the preview logic Conflicts: wagtail/wagtailadmin/views/pages.py --- wagtail/wagtailadmin/views/pages.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index fd0c97b02..7a2ec4f06 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -409,13 +409,6 @@ def preview_on_edit(request, page_id): if form.is_valid(): form.save(commit=False) - # This view will generally be invoked as an AJAX request; as such, in the case of - # an error Django will return a plaintext response. This isn't what we want, since - # we will be writing the response back to an HTML page regardless of success or - # failure - as such, we strip out the X-Requested-With header to get Django to return - # an HTML error response - request.META.pop('HTTP_X_REQUESTED_WITH', None) - try: display_mode = request.GET['mode'] except KeyError: @@ -465,13 +458,6 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p page.depth = parent_page.depth + 1 page.path = Page._get_children_path_interval(parent_page.path)[1] - # This view will generally be invoked as an AJAX request; as such, in the case of - # an error Django will return a plaintext response. This isn't what we want, since - # we will be writing the response back to an HTML page regardless of success or - # failure - as such, we strip out the X-Requested-With header to get Django to return - # an HTML error response - request.META.pop('HTTP_X_REQUESTED_WITH', None) - try: display_mode = request.GET['mode'] except KeyError: From 78481dc84665a9b27645c1139cb90a02ff6128e1 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 12 Jun 2014 16:48:44 +0100 Subject: [PATCH 192/298] syntactic sugar for get_page_modes: change it to a property called preview_modes and add a default_preview_mode helper Conflicts: wagtail/wagtailadmin/views/pages.py --- docs/building_your_site/djangodevelopers.rst | 2 +- docs/model_recipes.rst | 6 ++--- wagtail/wagtailadmin/views/pages.py | 23 +++++++------------- wagtail/wagtailcore/models.py | 15 ++++++++++--- wagtail/wagtailforms/models.py | 9 ++++---- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst index aeabb264f..e72573089 100644 --- a/docs/building_your_site/djangodevelopers.rst +++ b/docs/building_your_site/djangodevelopers.rst @@ -201,6 +201,7 @@ Properties: * status_string * subpage_types * indexed_fields +* preview_modes Methods: @@ -213,7 +214,6 @@ Methods: * get_descendants * get_siblings * search -* get_page_modes * show_as_mode diff --git a/docs/model_recipes.rst b/docs/model_recipes.rst index 6a4abed47..ae011126a 100644 --- a/docs/model_recipes.rst +++ b/docs/model_recipes.rst @@ -190,10 +190,10 @@ Load Alternate Templates by Overriding get_template() -Page Modes ----------- +Preview Modes +------------- -get_page_modes +preview_modes show_as_mode diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 7a2ec4f06..e5a0c885c 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -230,7 +230,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ 'page_class': page_class, 'parent_page': parent_page, 'edit_handler': edit_handler, - 'display_modes': page.get_page_modes(), + 'display_modes': page.preview_modes, 'form': form, # Used in unit tests }) @@ -361,7 +361,7 @@ def edit(request, page_id): 'page': page, 'edit_handler': edit_handler, 'errors_debug': errors_debug, - 'display_modes': page.get_page_modes(), + 'display_modes': page.preview_modes, 'form': form, # Used in unit tests }) @@ -409,12 +409,8 @@ def preview_on_edit(request, page_id): if form.is_valid(): form.save(commit=False) - try: - display_mode = request.GET['mode'] - except KeyError: - display_mode = page.get_page_modes()[0][0] - - response = page.show_as_mode(display_mode) + preview_mode = request.GET.get('mode', page.default_preview_mode) + response = page.show_as_mode(preview_mode) response['X-Wagtail-Preview'] = 'ok' return response @@ -425,7 +421,7 @@ def preview_on_edit(request, page_id): response = render(request, 'wagtailadmin/pages/edit.html', { 'page': page, 'edit_handler': edit_handler, - 'display_modes': page.get_page_modes(), + 'display_modes': page.preview_modes, }) response['X-Wagtail-Preview'] = 'error' return response @@ -458,11 +454,8 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p page.depth = parent_page.depth + 1 page.path = Page._get_children_path_interval(parent_page.path)[1] - try: - display_mode = request.GET['mode'] - except KeyError: - display_mode = page.get_page_modes()[0][0] - response = page.show_as_mode(display_mode) + preview_mode = request.GET.get('mode', page.default_preview_mode) + response = page.show_as_mode(preview_mode) response['X-Wagtail-Preview'] = 'ok' return response @@ -476,7 +469,7 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p 'page_class': page_class, 'parent_page': parent_page, 'edit_handler': edit_handler, - 'display_modes': page.get_page_modes(), + 'display_modes': page.preview_modes, }) response['X-Wagtail-Preview'] = 'error' return response diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index b980d7f54..42e132daa 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -706,19 +706,28 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): "request middleware returned a response") return request - def get_page_modes(self): + @property + def preview_modes(self): """ - Return a list of (internal_name, display_name) tuples for the modes in which + A list of (internal_name, display_name) tuples for the modes in which this page can be displayed for preview/moderation purposes. Ordinarily a page will only have one display mode, but subclasses of Page can override this - for example, a page containing a form might have a default view of the form, and a post-submission 'thankyou' page """ + return self.get_page_modes() + + def get_page_modes(self): + # Deprecated accessor for the preview_modes property return [('', 'Default')] + @property + def default_preview_mode(self): + return self.preview_modes[0][0] + def show_as_mode(self, mode_name): """ - Given an internal name from the get_page_modes() list, return an HTTP response + Given an internal name from the preview_modes list, return an HTTP response indicative of the page being viewed in that mode. By default this passes a dummy request into the serve() mechanism, ensuring that it matches the behaviour on the front-end; subclasses that define additional page modes will need to diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index 41414d391..6bde684ac 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -170,11 +170,10 @@ class AbstractForm(Page): 'form': form, }) - def get_page_modes(self): - return [ - ('form', 'Form'), - ('landing', 'Landing page'), - ] + preview_modes = [ + ('form', 'Form'), + ('landing', 'Landing page'), + ] def show_as_mode(self, mode): if mode == 'landing': From 0a38e0b8d3122db090475ac887ff6d00f9d1b2ff Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 12 Jun 2014 16:57:09 +0100 Subject: [PATCH 193/298] rename display_modes to preview_modes for consistency Conflicts: wagtail/wagtailadmin/views/pages.py --- .../wagtailadmin/templates/wagtailadmin/pages/create.html | 4 ++-- .../wagtailadmin/templates/wagtailadmin/pages/edit.html | 4 ++-- wagtail/wagtailadmin/views/pages.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html index b87af8fae..f21b93a27 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html @@ -39,12 +39,12 @@
          • {% trans 'Preview' as preview_label %} - {% if display_modes|length > 1 %} + {% if preview_modes|length > 1 %}
            {% include "wagtailadmin/pages/_preview_button_on_create.html" with label=preview_label icon=1 %}
              - {% for mode_name, mode_display_name in display_modes %} + {% for mode_name, mode_display_name in preview_modes %}
            • {% include "wagtailadmin/pages/_preview_button_on_create.html" with mode=mode_name label=mode_display_name %}
              • diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html index 901ee0ac1..8cc7fdca6 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html @@ -47,12 +47,12 @@
            • {% trans 'Preview' as preview_label %} - {% if display_modes|length > 1 %} + {% if preview_modes|length > 1 %}
              {% include "wagtailadmin/pages/_preview_button_on_edit.html" with label=preview_label icon=1 %}
                - {% for mode_name, mode_display_name in display_modes %} + {% for mode_name, mode_display_name in preview_modes %}
              • {% include "wagtailadmin/pages/_preview_button_on_edit.html" with mode=mode_name label=mode_display_name %}
                • diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index e5a0c885c..6d6157d33 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -230,7 +230,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_ 'page_class': page_class, 'parent_page': parent_page, 'edit_handler': edit_handler, - 'display_modes': page.preview_modes, + 'preview_modes': page.preview_modes, 'form': form, # Used in unit tests }) @@ -361,7 +361,7 @@ def edit(request, page_id): 'page': page, 'edit_handler': edit_handler, 'errors_debug': errors_debug, - 'display_modes': page.preview_modes, + 'preview_modes': page.preview_modes, 'form': form, # Used in unit tests }) @@ -421,7 +421,7 @@ def preview_on_edit(request, page_id): response = render(request, 'wagtailadmin/pages/edit.html', { 'page': page, 'edit_handler': edit_handler, - 'display_modes': page.preview_modes, + 'preview_modes': page.preview_modes, }) response['X-Wagtail-Preview'] = 'error' return response @@ -469,7 +469,7 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p 'page_class': page_class, 'parent_page': parent_page, 'edit_handler': edit_handler, - 'display_modes': page.preview_modes, + 'preview_modes': page.preview_modes, }) response['X-Wagtail-Preview'] = 'error' return response From 78abe31b058729574c9c09596d38b1f7e2013ddc Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 3 Jul 2014 15:15:12 +0100 Subject: [PATCH 194/298] Cleanup a few methods of UserPagePermissionsProxy --- wagtail/wagtailcore/models.py | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index b980d7f54..928dc5f64 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -960,10 +960,9 @@ class UserPagePermissionsProxy(object): return editable_pages - def can_edit_pages(self): """Return True if the user has permission to edit any pages""" - return True if self.editable_pages().count() else False + return self.editable_pages().exists() def publishable_pages(self): """Return a queryset of the pages that this user has permission to publish""" @@ -973,27 +972,18 @@ class UserPagePermissionsProxy(object): if self.user.is_superuser: return Page.objects.all() - # Translate each of the user's permission rules into a Q-expression - q_expressions = [] - for perm in self.permissions: - if perm.permission_type == 'publish': - # user has publish permission on any subpage of perm.page - # (including perm.page itself) - q_expressions.append( - Q(path__startswith=perm.page.path) - ) + publishable_pages = Page.objects.none() - if q_expressions: - all_rules = q_expressions[0] - for expr in q_expressions[1:]: - all_rules = all_rules | expr - return Page.objects.filter(all_rules) - else: - return Page.objects.none() + for perm in self.permissions.filter(permission_type='publish'): + # user has publish permission on any subpage of perm.page + # (including perm.page itself) + publishable_pages |= Page.objects.descendant_of(perm.page, inclusive=True) + + return publishable_pages def can_publish_pages(self): """Return True if the user has permission to publish any pages""" - return True if self.publishable_pages().count() else False + return self.publishable_pages().exists() class PagePermissionTester(object): From 493fc29c08ccd91349551e9921806a5d7cd501d1 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 3 Jul 2014 15:21:46 +0100 Subject: [PATCH 195/298] Deprecate the `show_as_mode` method in favour of `serve_preview` which additionally takes a 'request' argument --- docs/building_your_site/djangodevelopers.rst | 2 +- docs/model_recipes.rst | 2 +- wagtail/wagtailadmin/views/pages.py | 27 +++++++++++++- wagtail/wagtailcore/models.py | 39 ++++++++++++++++---- wagtail/wagtailforms/models.py | 6 +-- wagtail/wagtailforms/tests.py | 4 +- 6 files changed, 63 insertions(+), 17 deletions(-) diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst index e72573089..c24040364 100644 --- a/docs/building_your_site/djangodevelopers.rst +++ b/docs/building_your_site/djangodevelopers.rst @@ -214,7 +214,7 @@ Methods: * get_descendants * get_siblings * search -* show_as_mode +* serve_preview Page Queryset Methods diff --git a/docs/model_recipes.rst b/docs/model_recipes.rst index ae011126a..e799ef70a 100644 --- a/docs/model_recipes.rst +++ b/docs/model_recipes.rst @@ -194,7 +194,7 @@ Preview Modes ------------- preview_modes -show_as_mode +serve_preview diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 6d6157d33..a1fb6bdae 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -1,3 +1,5 @@ +import warnings + from django.http import Http404, HttpResponse from django.shortcuts import render, redirect, get_object_or_404 from django.core.exceptions import ValidationError, PermissionDenied @@ -396,6 +398,27 @@ def view_draft(request, page_id): return page.serve(request) +def get_preview_response(page, preview_mode): + """ + Helper function for preview_on_edit and preview_on_create - + return a page's preview response via either serve_preview or the deprecated + show_as_mode method + """ + # Check the deprecated Page.show_as_mode method, as subclasses of Page + # might be overriding that to return a response + response = page.show_as_mode(preview_mode) + if response: + warnings.warn( + "Defining 'show_as_mode' on a page model is deprecated. Use 'serve_preview' instead", + DeprecationWarning + ) + return response + else: + # show_as_mode did not return a response, so go ahead and use the 'proper' + # serve_preview method + return page.serve_preview(page.dummy_request(), preview_mode) + + @permission_required('wagtailadmin.access_admin') def preview_on_edit(request, page_id): # Receive the form submission that would typically be posted to the 'edit' view. If submission is valid, @@ -410,7 +433,7 @@ def preview_on_edit(request, page_id): form.save(commit=False) preview_mode = request.GET.get('mode', page.default_preview_mode) - response = page.show_as_mode(preview_mode) + response = get_preview_response(page, preview_mode) response['X-Wagtail-Preview'] = 'ok' return response @@ -455,7 +478,7 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p page.path = Page._get_children_path_interval(parent_page.path)[1] preview_mode = request.GET.get('mode', page.default_preview_mode) - response = page.show_as_mode(preview_mode) + response = get_preview_response(page, preview_mode) response['X-Wagtail-Preview'] = 'ok' return response diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 42e132daa..3d69873f9 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -725,15 +725,38 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): def default_preview_mode(self): return self.preview_modes[0][0] + def serve_preview(self, request, mode_name): + """ + Return an HTTP response for use in page previews. Normally this would be equivalent + to self.serve(request), since we obviously want the preview to be indicative of how + it looks on the live site. However, there are a couple of cases where this is not + appropriate, and custom behaviour is required: + + 1) The page has custom routing logic that derives some additional required + args/kwargs to be passed to serve(). The routing mechanism is bypassed when + previewing, so there's no way to know what args we should pass. In such a case, + the page model needs to implement its own version of serve_preview. + + 2) The page has several different renderings that we would like to be able to see + when previewing - for example, a form page might have one rendering that displays + the form, and another rendering to display a landing page when the form is posted. + This can be done by setting a custom preview_modes list on the page model - + Wagtail will allow the user to specify one of those modes when previewing, and + pass the chosen mode_name to serve_preview so that the page model can decide how + to render it appropriately. (Page models that do not specify their own preview_modes + list will always receive an empty string as mode_name.) + + Any templates rendered during this process should use the 'request' object passed + here - this ensures that request.user and other properties are set appropriately for + the wagtail user bar to be displayed. This request will always be a GET. + """ + return self.serve(request) + def show_as_mode(self, mode_name): - """ - Given an internal name from the preview_modes list, return an HTTP response - indicative of the page being viewed in that mode. By default this passes a - dummy request into the serve() mechanism, ensuring that it matches the behaviour - on the front-end; subclasses that define additional page modes will need to - implement alternative logic to serve up the appropriate view here. - """ - return self.serve(self.dummy_request()) + # Deprecated API for rendering previews. If this returns something other than None, + # we know that a subclass of Page has overridden this, and we should try to work with + # that response if possible. + return None def get_cached_paths(self): """ diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index 6bde684ac..79dcaa0e2 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -175,13 +175,13 @@ class AbstractForm(Page): ('landing', 'Landing page'), ] - def show_as_mode(self, mode): + def serve_preview(self, request, mode): if mode == 'landing': - return render(self.dummy_request(), self.landing_page_template, { + return render(request, self.landing_page_template, { 'self': self, }) else: - return super(AbstractForm, self).show_as_mode(mode) + return super(AbstractForm, self).serve_preview(request, mode) class AbstractEmailForm(AbstractForm): diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py index 38903d2ff..28df108ab 100644 --- a/wagtail/wagtailforms/tests.py +++ b/wagtail/wagtailforms/tests.py @@ -61,7 +61,7 @@ class TestPageModes(TestCase): self.form_page = Page.objects.get(url_path='/home/contact-us/').specific def test_form(self): - response = self.form_page.show_as_mode('form') + response = self.form_page.serve_preview(self.form_page.dummy_request(), 'form') # Check response self.assertContains(response, """""") @@ -69,7 +69,7 @@ class TestPageModes(TestCase): self.assertTemplateNotUsed(response, 'tests/form_page_landing.html') def test_landing(self): - response = self.form_page.show_as_mode('landing') + response = self.form_page.serve_preview(self.form_page.dummy_request(), 'landing') # Check response self.assertContains(response, "Thank you for your feedback.") From a1bf11113adb68216b0e703290a958ec8bc0b9dd Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 3 Jul 2014 15:51:24 +0100 Subject: [PATCH 196/298] update view_draft and preview_for_moderation to call serve_preview (rather than serve, which for some page models might require additional args/kwargs) --- wagtail/wagtailadmin/views/pages.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index a1fb6bdae..013ce40c0 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -9,6 +9,7 @@ from django.contrib.auth.decorators import permission_required from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.utils import timezone from django.utils.translation import ugettext as _ +from django.views.decorators.http import require_GET from django.views.decorators.vary import vary_on_headers from wagtail.wagtailadmin.edit_handlers import TabbedInterface, ObjectList @@ -395,7 +396,7 @@ def delete(request, page_id): @permission_required('wagtailadmin.access_admin') def view_draft(request, page_id): page = get_object_or_404(Page, id=page_id).get_latest_revision_as_page() - return page.serve(request) + return page.serve_preview(page.dummy_request(), page.default_preview_mode) def get_preview_response(page, preview_mode): @@ -729,6 +730,7 @@ def reject_moderation(request, revision_id): @permission_required('wagtailadmin.access_admin') +@require_GET def preview_for_moderation(request, revision_id): revision = get_object_or_404(PageRevision, id=revision_id) if not revision.page.permissions_for_user(request.user).can_publish(): @@ -742,4 +744,6 @@ def preview_for_moderation(request, revision_id): request.revision_id = revision_id - return page.serve(request) + # pass in the real user request rather than page.dummy_request(), so that request.user + # and request.revision_id will be picked up by the wagtail user bar + return page.serve_preview(request, page.default_preview_mode) From c0d2a70d6d39dbfbfab21f770faf0ca698c3b38c Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 3 Jul 2014 16:46:10 +0100 Subject: [PATCH 197/298] output a DeprecationWarning if get_page_modes has been overridden --- wagtail/wagtailcore/models.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 3d69873f9..dfc6ef0a9 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -706,6 +706,8 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): "request middleware returned a response") return request + DEFAULT_PREVIEW_MODES = [('', 'Default')] + @property def preview_modes(self): """ @@ -715,11 +717,16 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): for example, a page containing a form might have a default view of the form, and a post-submission 'thankyou' page """ - return self.get_page_modes() + modes = self.get_page_modes() + if modes is not Page.DEFAULT_PREVIEW_MODES: + # User has overriden get_page_modes instead of using preview_modes + warnings.warn("Overriding get_page_modes is deprecated. Define a preview_modes property instead", DeprecationWarning) + + return modes def get_page_modes(self): # Deprecated accessor for the preview_modes property - return [('', 'Default')] + return Page.DEFAULT_PREVIEW_MODES @property def default_preview_mode(self): From dcca9bd515f5bfbaed35c912236573d85a41d473 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 4 Jul 2014 10:24:32 +0100 Subject: [PATCH 198/298] Use a multi_match query instead of a query_string query --- .../wagtailsearch/backends/elasticsearch.py | 4 +-- .../tests/test_elasticsearch_backend.py | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 289b0f4b2..c28b676ee 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -258,14 +258,14 @@ class ElasticSearchQuery(object): # Query if self.query_string is not None: query = { - 'query_string': { + 'multi_match': { 'query': self.query_string, } } # Fields if self.fields: - query['query_string']['fields'] = self.fields + query['multi_match']['fields'] = self.fields else: query = { 'match_all': {} diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py index 0c7906b39..6d2df3b4c 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py @@ -88,7 +88,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello") # Check it - expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_none_query_string(self): @@ -104,7 +104,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title="Test"), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_and_filter(self): @@ -112,7 +112,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title="Test", live=True), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'and': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'and': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} # Make sure field filters are sorted (as they can be in any order which may cause false positives) query = query.to_es() @@ -131,7 +131,7 @@ class TestElasticSearchQuery(TestCase): field_filters[:] = sorted(field_filters, key=lambda f: list(f['term'].keys())[0]) # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'or': [{'term': {'live_filter': True}}, {'term': {'title_filter': 'Test'}}]}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query, expected_result) def test_negated_filter(self): @@ -139,7 +139,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.exclude(live=True), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'term': {'live_filter': True}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'term': {'live_filter': True}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_fields(self): @@ -147,7 +147,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello", fields=['title']) # Check it - expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'query_string': {'query': 'Hello', 'fields': ['title']}}}} + expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['title']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_exact_lookup(self): @@ -155,7 +155,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__exact="Test"), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'term': {'title_filter': 'Test'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_none_lookup(self): @@ -163,7 +163,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title=None), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_isnull_true_lookup(self): @@ -171,7 +171,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__isnull=True), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'missing': {'field': 'title_filter'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_isnull_false_lookup(self): @@ -179,7 +179,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__isnull=False), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'missing': {'field': 'title_filter'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'not': {'missing': {'field': 'title_filter'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_startswith_lookup(self): @@ -187,7 +187,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(title__startswith="Test"), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'prefix': {'title_filter': 'Test'}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'prefix': {'title_filter': 'Test'}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_gt_lookup(self): @@ -198,7 +198,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__gt=datetime.datetime(2014, 4, 29)), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gt': '2014-04-29'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gt': '2014-04-29'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) def test_range_lookup(self): @@ -209,7 +209,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.filter(published_date__range=(start_date, end_date)), "Hello") # Check it - expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29', 'lte': '2014-08-19'}}}]}, 'query': {'query_string': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} + expected_result = {'filtered': {'filter': {'and': [{'prefix': {'content_type': 'tests_searchtest'}}, {'range': {'published_date_filter': {'gte': '2014-04-29', 'lte': '2014-08-19'}}}]}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['_all', '_partials']}}}} self.assertDictEqual(query.to_es(), expected_result) From 7fc10398ddc657cc1708be8ce01b5285118b8598 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 4 Jul 2014 10:31:50 +0100 Subject: [PATCH 199/298] Minor optimisation when building single field queries --- .../wagtailsearch/backends/elasticsearch.py | 24 ++++++++++++------- .../tests/test_elasticsearch_backend.py | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index c28b676ee..55f1971a2 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -121,7 +121,7 @@ class ElasticSearchQuery(object): def __init__(self, queryset, query_string, fields=None): self.queryset = queryset self.query_string = query_string - self.fields = fields or ['_all', '_partials'] + self.fields = fields def _get_filters_from_where(self, where_node): # Check if this is a leaf node @@ -257,15 +257,21 @@ class ElasticSearchQuery(object): def to_es(self): # Query if self.query_string is not None: - query = { - 'multi_match': { - 'query': self.query_string, - } - } + fields = self.fields or ['_all', '_partials'] - # Fields - if self.fields: - query['multi_match']['fields'] = self.fields + if len(fields) == 1: + query = { + 'match': { + fields[0]: self.query_string, + } + } + else: + query = { + 'multi_match': { + 'query': self.query_string, + 'fields': fields, + } + } else: query = { 'match_all': {} diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py index 6d2df3b4c..eeb23ff33 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch_backend.py @@ -147,7 +147,7 @@ class TestElasticSearchQuery(TestCase): query = self.ElasticSearchQuery(models.SearchTest.objects.all(), "Hello", fields=['title']) # Check it - expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'multi_match': {'query': 'Hello', 'fields': ['title']}}}} + expected_result = {'filtered': {'filter': {'prefix': {'content_type': 'tests_searchtest'}}, 'query': {'match': {'title': 'Hello'}}}} self.assertDictEqual(query.to_es(), expected_result) def test_exact_lookup(self): From fe3c2e6c0b1b2faed8c696e8919b2ae953a393ef Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 4 Jul 2014 11:33:34 +0100 Subject: [PATCH 200/298] Added __repr__ to EditorsPicK --- wagtail/wagtailsearch/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wagtail/wagtailsearch/models.py b/wagtail/wagtailsearch/models.py index abb479295..dd2a0cb69 100644 --- a/wagtail/wagtailsearch/models.py +++ b/wagtail/wagtailsearch/models.py @@ -76,6 +76,9 @@ class EditorsPick(models.Model): sort_order = models.IntegerField(null=True, blank=True, editable=False) description = models.TextField(blank=True) + def __repr__(self): + return 'EditorsPick(query="' + self.query.query_string + '", page="' + self.page.title + '")' + class Meta: ordering = ('sort_order', ) From c7ec5792f689e0b9c7324edfd170ec01c85ddb6b Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 4 Jul 2014 11:34:13 +0100 Subject: [PATCH 201/298] Make sure all editors picks are resaved on edit. Fixes #408 As we are setting the sort_order manually. The formset doesn't think the editors pick has changed so doesn't save it. This caused a SQLite test to fail as NULL is always greater than any integer causing ordering to be incorrect. --- wagtail/wagtailsearch/views/editorspicks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wagtail/wagtailsearch/views/editorspicks.py b/wagtail/wagtailsearch/views/editorspicks.py index 8e1155922..fe45a7c56 100644 --- a/wagtail/wagtailsearch/views/editorspicks.py +++ b/wagtail/wagtailsearch/views/editorspicks.py @@ -55,6 +55,9 @@ def save_editorspicks(query, new_query, editors_pick_formset): for i, form in enumerate(editors_pick_formset.ordered_forms): form.instance.sort_order = i + # Make sure the form is marked as changed so it gets saved with the new order + form.has_changed = lambda: True + editors_pick_formset.save() # If query was changed, move all editors picks to the new query From 56647908d0eab38874787c79190df2c53541393a Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 4 Jul 2014 11:39:42 +0100 Subject: [PATCH 202/298] Improved test_post_reorder test --- wagtail/wagtailsearch/tests/test_editorspicks.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wagtail/wagtailsearch/tests/test_editorspicks.py b/wagtail/wagtailsearch/tests/test_editorspicks.py index b2ebece9f..0888d115c 100644 --- a/wagtail/wagtailsearch/tests/test_editorspicks.py +++ b/wagtail/wagtailsearch/tests/test_editorspicks.py @@ -218,6 +218,10 @@ class TestEditorsPicksEditView(TestCase, WagtailTestUtils): # User should be redirected back to the index self.assertRedirects(response, reverse('wagtailsearch_editorspicks_index')) + # Check that the ordering has been saved correctly + self.assertEqual(models.EditorsPick.objects.get(id=self.editors_pick.id).sort_order, 1) + self.assertEqual(models.EditorsPick.objects.get(id=self.editors_pick_2.id).sort_order, 0) + # Check that the recommendations were reordered self.assertEqual(models.Query.get("Hello").editors_picks.all()[0], self.editors_pick_2) self.assertEqual(models.Query.get("Hello").editors_picks.all()[1], self.editors_pick) From 6e32b6cf9b296edc48730fba5ae3640f47b3bef5 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 2 Jun 2014 14:18:19 +0100 Subject: [PATCH 203/298] Update Page.route API so that it returns a Page instance rather than an HttpResponse; catch the latter in the 'serve' view for backward compatibility --- wagtail/tests/fixtures/test.json | 25 +++++++++++++++++++- wagtail/tests/models.py | 13 ++++++++++ wagtail/wagtailcore/models.py | 2 +- wagtail/wagtailcore/tests/test_page_model.py | 21 ++++++++++++++-- wagtail/wagtailcore/views.py | 14 +++++++++-- 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/wagtail/tests/fixtures/test.json b/wagtail/tests/fixtures/test.json index 2d3db6e35..b769b7960 100644 --- a/wagtail/tests/fixtures/test.json +++ b/wagtail/tests/fixtures/test.json @@ -23,7 +23,7 @@ "model": "wagtailcore.page", "fields": { "title": "Welcome to the Wagtail test site!", - "numchild": 3, + "numchild": 4, "show_in_menus": false, "live": true, "depth": 2, @@ -257,6 +257,29 @@ } }, +{ + "pk": 10, + "model": "wagtailcore.page", + "fields": { + "title": "Old style route method", + "numchild": 0, + "show_in_menus": true, + "live": true, + "depth": 3, + "content_type": ["tests", "pagewitholdstyleroutemethod"], + "path": "000100010004", + "url_path": "/home/old-style-route/", + "slug": "old-style-route" + } +}, +{ + "pk": 10, + "model": "tests.pagewitholdstyleroutemethod", + "fields": { + "content": "

                Test with old style route method

                " + } +}, + { "pk": 1, "model": "wagtailcore.site", diff --git a/wagtail/tests/models.py b/wagtail/tests/models.py index ff6dc2dcc..0c369dd34 100644 --- a/wagtail/tests/models.py +++ b/wagtail/tests/models.py @@ -106,6 +106,19 @@ class SimplePage(Page): content = models.TextField() +class PageWithOldStyleRouteMethod(Page): + """ + Prior to Wagtail 0.4, the route() method on Page returned an HttpResponse + rather than a Page instance. As subclasses of Page may override route, + we need to continue accepting this convention (albeit as a deprecated API). + """ + content = models.TextField() + template = 'tests/simple_page.html' + + def route(self, request, path_components): + return self.serve(request) + + # Event page class EventPageCarouselItem(Orderable, CarouselItem): diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index cf33bcbfb..d8edbfc72 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -415,7 +415,7 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): else: # request is for this very page if self.live: - return self.serve(request) + return self else: raise Http404 diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index da9fc6174..0543bf32c 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -2,7 +2,7 @@ from django.test import TestCase, Client from django.http import HttpRequest, Http404 from wagtail.wagtailcore.models import Page, Site -from wagtail.tests.models import EventPage, EventIndex, SimplePage +from wagtail.tests.models import EventPage, EventIndex, SimplePage, PageWithOldStyleRouteMethod class TestSiteRouting(TestCase): @@ -136,8 +136,13 @@ class TestRouting(TestCase): request = HttpRequest() request.path = '/events/christmas/' - response = homepage.route(request, ['events', 'christmas']) + found_page = homepage.route(request, ['events', 'christmas']) + self.assertEqual(found_page, christmas_page) + def test_request_serving(self): + christmas_page = EventPage.objects.get(url_path='/home/events/christmas/') + request = HttpRequest() + response = christmas_page.serve(request) self.assertEqual(response.status_code, 200) self.assertEqual(response.context_data['self'], christmas_page) used_template = response.resolve_template(response.template_name) @@ -226,6 +231,18 @@ class TestServeView(TestCase): self.assertContains(response, 'Christmas') + def test_old_style_routing(self): + """ + Test that route() methods that return an HttpResponse are correctly handled + """ + response = self.client.get('/old-style-route/') + expected_page = PageWithOldStyleRouteMethod.objects.get(url_path='/home/old-style-route/') + + self.assertEqual(response.status_code, 200) + self.assertEqual(response.context['self'], expected_page) + self.assertEqual(response.templates[0].name, 'tests/simple_page.html') + + class TestStaticSitePaths(TestCase): def setUp(self): self.root_page = Page.objects.get(id=1) diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py index 1b1f6cf43..7377cf761 100644 --- a/wagtail/wagtailcore/views.py +++ b/wagtail/wagtailcore/views.py @@ -1,4 +1,6 @@ -from django.http import Http404 +import warnings + +from django.http import HttpResponse, Http404 def serve(request, path): @@ -8,4 +10,12 @@ def serve(request, path): raise Http404 path_components = [component for component in path.split('/') if component] - return request.site.root_page.specific.route(request, path_components) + page = request.site.root_page.specific.route(request, path_components) + if isinstance(page, HttpResponse): + warnings.warn( + "Page.route should return a Page, not an HttpResponse", + DeprecationWarning + ) + return page + + return page.serve(request) From 9cc3614097b1ea645eabf63a45fe6e2338a641af Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 2 Jun 2014 23:00:20 +0100 Subject: [PATCH 204/298] Catch the deprecation warning for old-style routes during unit tests --- wagtail/wagtailcore/tests/test_page_model.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 0543bf32c..34f8356f2 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -1,3 +1,5 @@ +import warnings + from django.test import TestCase, Client from django.http import HttpRequest, Http404 @@ -235,9 +237,15 @@ class TestServeView(TestCase): """ Test that route() methods that return an HttpResponse are correctly handled """ - response = self.client.get('/old-style-route/') - expected_page = PageWithOldStyleRouteMethod.objects.get(url_path='/home/old-style-route/') + with warnings.catch_warnings(record=True) as w: + response = self.client.get('/old-style-route/') + # Check that a DeprecationWarning has been triggered + self.assertEqual(len(w), 1) + self.assertTrue(issubclass(w[-1].category, DeprecationWarning)) + self.assertTrue("Page.route should return a Page" in str(w[-1].message)) + + expected_page = PageWithOldStyleRouteMethod.objects.get(url_path='/home/old-style-route/') self.assertEqual(response.status_code, 200) self.assertEqual(response.context['self'], expected_page) self.assertEqual(response.templates[0].name, 'tests/simple_page.html') From df15ece5dcef3962b5c0b2ee914018491bf20e9a Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 2 Jun 2014 23:30:00 +0100 Subject: [PATCH 205/298] Implement before_serve_page hook --- wagtail/tests/wagtail_hooks.py | 8 ++++++++ wagtail/wagtailcore/tests/test_page_model.py | 4 ++++ wagtail/wagtailcore/views.py | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/wagtail/tests/wagtail_hooks.py b/wagtail/tests/wagtail_hooks.py index 13e3e46d2..4ad63e881 100644 --- a/wagtail/tests/wagtail_hooks.py +++ b/wagtail/tests/wagtail_hooks.py @@ -1,3 +1,5 @@ +from django.http import HttpResponse + from wagtail.wagtailcore import hooks from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes @@ -17,3 +19,9 @@ def whitelister_element_rules(): 'a': attribute_rule({'href': check_url, 'target': True}), } hooks.register('construct_whitelister_element_rules', whitelister_element_rules) + + +def block_googlebot(page, request): + if request.META.get('HTTP_USER_AGENT') == 'GoogleBot': + return HttpResponse("

                bad googlebot no cookie

                ") +hooks.register('before_serve_page', block_googlebot) diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 34f8356f2..ab5b9c148 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -250,6 +250,10 @@ class TestServeView(TestCase): self.assertEqual(response.context['self'], expected_page) self.assertEqual(response.templates[0].name, 'tests/simple_page.html') + def test_before_serve_hook(self): + response = self.client.get('/events/', HTTP_USER_AGENT='GoogleBot') + self.assertContains(response, 'bad googlebot no cookie') + class TestStaticSitePaths(TestCase): def setUp(self): diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py index 7377cf761..0872dd68f 100644 --- a/wagtail/wagtailcore/views.py +++ b/wagtail/wagtailcore/views.py @@ -2,6 +2,8 @@ import warnings from django.http import HttpResponse, Http404 +from wagtail.wagtailcore import hooks + def serve(request, path): # we need a valid Site object corresponding to this request (set in wagtail.wagtailcore.middleware.SiteMiddleware) @@ -18,4 +20,9 @@ def serve(request, path): ) return page + for fn in hooks.get_hooks('before_serve_page'): + result = fn(page, request) + if isinstance(result, HttpResponse): + return result + return page.serve(request) From 4af5f3d24d50ebaa0f65dba76b678115c3afca07 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 3 Jun 2014 11:22:46 +0100 Subject: [PATCH 206/298] Add PageViewRestriction model, and apply permission check in the 'serve' view --- .../0005_create_page_view_restriction.py | 117 ++++++++++++++++++ wagtail/wagtailcore/models.py | 7 ++ wagtail/wagtailcore/wagtail_hooks.py | 11 ++ 3 files changed, 135 insertions(+) create mode 100644 wagtail/wagtailcore/migrations/0005_create_page_view_restriction.py create mode 100644 wagtail/wagtailcore/wagtail_hooks.py diff --git a/wagtail/wagtailcore/migrations/0005_create_page_view_restriction.py b/wagtail/wagtailcore/migrations/0005_create_page_view_restriction.py new file mode 100644 index 000000000..f2d79573f --- /dev/null +++ b/wagtail/wagtailcore/migrations/0005_create_page_view_restriction.py @@ -0,0 +1,117 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'PageViewRestriction' + db.create_table('wagtailcore_pageviewrestriction', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('page', self.gf('django.db.models.fields.related.ForeignKey')(related_name='view_restrictions', to=orm['wagtailcore.Page'])), + ('password', self.gf('django.db.models.fields.CharField')(max_length=255)), + )) + db.send_create_signal('wagtailcore', ['PageViewRestriction']) + + + def backwards(self, orm): + # Deleting model 'PageViewRestriction' + db.delete_table('wagtailcore_pageviewrestriction') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True', 'to': "orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'wagtailcore.grouppagepermission': { + 'Meta': {'object_name': 'GroupPagePermission'}, + 'group': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_permissions'", 'to': "orm['auth.Group']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_permissions'", 'to': "orm['wagtailcore.Page']"}), + 'permission_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}) + }, + 'wagtailcore.page': { + 'Meta': {'object_name': 'Page'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': "orm['contenttypes.ContentType']"}), + 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'expire_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'expired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'has_unpublished_changes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_pages'", 'null': 'True', 'to': "orm['auth.User']"}), + 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'search_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'seo_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'show_in_menus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'url_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'wagtailcore.pagerevision': { + 'Meta': {'object_name': 'PageRevision'}, + 'approved_go_live_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'content_json': ('django.db.models.fields.TextField', [], {}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'revisions'", 'to': "orm['wagtailcore.Page']"}), + 'submitted_for_moderation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + 'wagtailcore.pageviewrestriction': { + 'Meta': {'object_name': 'PageViewRestriction'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'view_restrictions'", 'to': "orm['wagtailcore.Page']"}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'wagtailcore.site': { + 'Meta': {'unique_together': "(('hostname', 'port'),)", 'object_name': 'Site'}, + 'hostname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_default_site': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'port': ('django.db.models.fields.IntegerField', [], {'default': '80'}), + 'root_page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites_rooted_here'", 'to': "orm['wagtailcore.Page']"}) + } + } + + complete_apps = ['wagtailcore'] \ No newline at end of file diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index d8edbfc72..b035a0856 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -9,6 +9,8 @@ from modelcluster.models import ClusterableModel from django.db import models, connection, transaction from django.db.models import get_model, Q +from django.db.models.signals import post_save +from django.dispatch import receiver from django.http import Http404 from django.core.cache import cache from django.core.handlers.wsgi import WSGIRequest @@ -1150,3 +1152,8 @@ class PagePermissionTester(object): else: # no publishing required, so the already-tested 'add' permission is sufficient return True + + +class PageViewRestriction(models.Model): + page = models.ForeignKey('Page', related_name='view_restrictions') + password = models.CharField(max_length=255) diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py new file mode 100644 index 000000000..1dd480001 --- /dev/null +++ b/wagtail/wagtailcore/wagtail_hooks.py @@ -0,0 +1,11 @@ +from django.http import HttpResponse + +from wagtail.wagtailcore import hooks +from wagtail.wagtailcore.models import PageViewRestriction + +def check_view_restrictions(page, request): + ancestors_and_self = list(page.get_ancestors().values_list('id', flat=True)) + [page] + restrictions = PageViewRestriction.objects.filter(page__in=ancestors_and_self) + for restriction in restrictions: + return HttpResponse("

                Blocked due to view restriction

                ") +hooks.register('before_serve_page', check_view_restrictions) From 6f855d7fd86556956248ded90c7e27832b3a713d Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 3 Jun 2014 15:34:27 +0100 Subject: [PATCH 207/298] simplified get_ancestors logic --- wagtail/wagtailcore/wagtail_hooks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py index 1dd480001..73c98a01d 100644 --- a/wagtail/wagtailcore/wagtail_hooks.py +++ b/wagtail/wagtailcore/wagtail_hooks.py @@ -4,8 +4,7 @@ from wagtail.wagtailcore import hooks from wagtail.wagtailcore.models import PageViewRestriction def check_view_restrictions(page, request): - ancestors_and_self = list(page.get_ancestors().values_list('id', flat=True)) + [page] - restrictions = PageViewRestriction.objects.filter(page__in=ancestors_and_self) + restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True)) for restriction in restrictions: return HttpResponse("

                Blocked due to view restriction

                ") hooks.register('before_serve_page', check_view_restrictions) From d0e93f997f5caf8be28989d1907413f12c3e9b56 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 3 Jun 2014 17:24:04 +0100 Subject: [PATCH 208/298] Delegate serving of the 'password required' response to the Page model --- wagtail/wagtailcore/models.py | 8 ++++++++ .../templates/wagtailcore/password_required.html | 9 +++++++++ wagtail/wagtailcore/wagtail_hooks.py | 4 +--- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 wagtail/wagtailcore/templates/wagtailcore/password_required.html diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index b035a0856..59c9eb861 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -811,6 +811,14 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): def get_prev_siblings(self, inclusive=False): return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path') + password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html') + def serve_password_required_response(self, request, form): + return TemplateResponse(request, self.password_required_template, { + 'self': self, + 'request': request, + 'form': form, + }) + def get_navigation_menu_items(): # Get all pages that appear in the navigation menu: ones which have children, diff --git a/wagtail/wagtailcore/templates/wagtailcore/password_required.html b/wagtail/wagtailcore/templates/wagtailcore/password_required.html new file mode 100644 index 000000000..d4ee0b1fc --- /dev/null +++ b/wagtail/wagtailcore/templates/wagtailcore/password_required.html @@ -0,0 +1,9 @@ + + + + Password required + + +

                Password required

                + + diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py index 73c98a01d..347194c32 100644 --- a/wagtail/wagtailcore/wagtail_hooks.py +++ b/wagtail/wagtailcore/wagtail_hooks.py @@ -1,10 +1,8 @@ -from django.http import HttpResponse - from wagtail.wagtailcore import hooks from wagtail.wagtailcore.models import PageViewRestriction def check_view_restrictions(page, request): restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True)) for restriction in restrictions: - return HttpResponse("

                Blocked due to view restriction

                ") + return page.serve_password_required_response(request, None) hooks.register('before_serve_page', check_view_restrictions) From e4008a814824a24f36c288f7309c4867b8919870 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 4 Jun 2014 15:28:03 +0100 Subject: [PATCH 209/298] implement form submission logic for the password form --- wagtail/wagtailcore/forms.py | 16 +++++++++++++ wagtail/wagtailcore/models.py | 18 +++++++++----- .../wagtailcore/password_required.html | 6 +++++ wagtail/wagtailcore/urls.py | 5 +++- wagtail/wagtailcore/views.py | 24 +++++++++++++++++++ wagtail/wagtailcore/wagtail_hooks.py | 10 +++++++- 6 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 wagtail/wagtailcore/forms.py diff --git a/wagtail/wagtailcore/forms.py b/wagtail/wagtailcore/forms.py new file mode 100644 index 000000000..1b83c8c94 --- /dev/null +++ b/wagtail/wagtailcore/forms.py @@ -0,0 +1,16 @@ +from django import forms + +class PasswordPageViewRestrictionForm(forms.Form): + password = forms.CharField(label="Password", widget=forms.PasswordInput) + return_url = forms.CharField(widget=forms.HiddenInput) + + def __init__(self, *args, **kwargs): + self.restriction = kwargs.pop('instance') + super(PasswordPageViewRestrictionForm, self).__init__(*args, **kwargs) + + def clean_password(self): + data = self.cleaned_data['password'] + if data != self.restriction.password: + raise forms.ValidationError("The password you have entered is not correct. Please try again.") + + return data diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 59c9eb861..08e1b612b 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -812,12 +812,18 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path') password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html') - def serve_password_required_response(self, request, form): - return TemplateResponse(request, self.password_required_template, { - 'self': self, - 'request': request, - 'form': form, - }) + def serve_password_required_response(self, request, form, action_url): + """ + Serve a response indicating that the user has been denied access to view this page, + and must supply a password. + form = a Django form object containing the password input + (and zero or more hidden fields that also need to be output on the template) + action_url = URL that this form should be POSTed to + """ + context = self.get_context(request) + context['form'] = form + context['action_url'] = action_url + return TemplateResponse(request, self.password_required_template, context) def get_navigation_menu_items(): diff --git a/wagtail/wagtailcore/templates/wagtailcore/password_required.html b/wagtail/wagtailcore/templates/wagtailcore/password_required.html index d4ee0b1fc..d7601ca69 100644 --- a/wagtail/wagtailcore/templates/wagtailcore/password_required.html +++ b/wagtail/wagtailcore/templates/wagtailcore/password_required.html @@ -5,5 +5,11 @@

                Password required

                +

                You need a password to access this page.

                +
                + {% csrf_token %} + {{ form.as_p }} + +
                diff --git a/wagtail/wagtailcore/urls.py b/wagtail/wagtailcore/urls.py index f0336fec4..9777dea8a 100644 --- a/wagtail/wagtailcore/urls.py +++ b/wagtail/wagtailcore/urls.py @@ -2,7 +2,10 @@ from django.conf.urls import url from wagtail.wagtailcore import views urlpatterns = [ - # All front-end views are handled through Wagtail's core.views.serve mechanism. + url(r'^_util/authenticate_with_password/(\d+)/(\d+)/$', views.authenticate_with_password, + name='wagtailcore_authenticate_with_password'), + + # Front-end page views are handled through Wagtail's core.views.serve mechanism. # Here we match a (possibly empty) list of path segments, each followed by # a '/'. If a trailing slash is not present, we leave CommonMiddleware to # handle it as usual (i.e. redirect it to the trailing slash version if diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py index 0872dd68f..bd12d7f97 100644 --- a/wagtail/wagtailcore/views.py +++ b/wagtail/wagtailcore/views.py @@ -1,8 +1,12 @@ import warnings from django.http import HttpResponse, Http404 +from django.shortcuts import get_object_or_404, redirect +from django.core.urlresolvers import reverse from wagtail.wagtailcore import hooks +from wagtail.wagtailcore.models import Page, PageViewRestriction +from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm def serve(request, path): @@ -26,3 +30,23 @@ def serve(request, path): return result return page.serve(request) + + +def authenticate_with_password(request, page_view_restriction_id, page_id): + """ + Handle a submission of PasswordPageViewRestrictionForm to grant view access over a + subtree that is protected by a PageViewRestriction + """ + restriction = get_object_or_404(PageViewRestriction, id=page_view_restriction_id) + page = get_object_or_404(Page, id=page_id).specific + + if request.POST: + form = PasswordPageViewRestrictionForm(request.POST, instance=restriction) + if form.is_valid(): + # TODO: record 'has authenticated against this page view restriction' flag in the session + return redirect(form.cleaned_data['return_url']) + else: + form = PasswordPageViewRestrictionForm(instance=restriction) + + action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id]) + return page.serve_password_required_response(request, form, action_url) diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py index 347194c32..ccac0bd43 100644 --- a/wagtail/wagtailcore/wagtail_hooks.py +++ b/wagtail/wagtailcore/wagtail_hooks.py @@ -1,8 +1,16 @@ +from django.core.urlresolvers import reverse + from wagtail.wagtailcore import hooks from wagtail.wagtailcore.models import PageViewRestriction +from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm def check_view_restrictions(page, request): restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True)) + for restriction in restrictions: - return page.serve_password_required_response(request, None) + form = PasswordPageViewRestrictionForm(instance=restriction, + initial={'return_url': request.get_full_path()}) + action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id]) + return page.serve_password_required_response(request, form, action_url) + hooks.register('before_serve_page', check_view_restrictions) From 1e71e10cd22d18e170d45d05349b8427358c7153 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 4 Jun 2014 16:02:43 +0100 Subject: [PATCH 210/298] Keep track of passed page view restrictions in the session --- wagtail/wagtailcore/views.py | 11 ++++++++++- wagtail/wagtailcore/wagtail_hooks.py | 13 ++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py index bd12d7f97..78e0476b6 100644 --- a/wagtail/wagtailcore/views.py +++ b/wagtail/wagtailcore/views.py @@ -3,6 +3,7 @@ import warnings from django.http import HttpResponse, Http404 from django.shortcuts import get_object_or_404, redirect from django.core.urlresolvers import reverse +from django.conf import settings from wagtail.wagtailcore import hooks from wagtail.wagtailcore.models import Page, PageViewRestriction @@ -43,7 +44,15 @@ def authenticate_with_password(request, page_view_restriction_id, page_id): if request.POST: form = PasswordPageViewRestrictionForm(request.POST, instance=restriction) if form.is_valid(): - # TODO: record 'has authenticated against this page view restriction' flag in the session + has_existing_session = (settings.SESSION_COOKIE_NAME in request.COOKIES) + passed_restrictions = request.session.setdefault('passed_page_view_restrictions', []) + if restriction.id not in passed_restrictions: + passed_restrictions.append(restriction.id) + if not has_existing_session: + # if this is a session we've created, set it to expire at the end + # of the browser session + request.session.set_expiry(0) + return redirect(form.cleaned_data['return_url']) else: form = PasswordPageViewRestrictionForm(instance=restriction) diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py index ccac0bd43..b2ab31248 100644 --- a/wagtail/wagtailcore/wagtail_hooks.py +++ b/wagtail/wagtailcore/wagtail_hooks.py @@ -7,10 +7,13 @@ from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm def check_view_restrictions(page, request): restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True)) - for restriction in restrictions: - form = PasswordPageViewRestrictionForm(instance=restriction, - initial={'return_url': request.get_full_path()}) - action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id]) - return page.serve_password_required_response(request, form, action_url) + if restrictions: + passed_restrictions = request.session.get('passed_page_view_restrictions', []) + for restriction in restrictions: + if restriction.id not in passed_restrictions: + form = PasswordPageViewRestrictionForm(instance=restriction, + initial={'return_url': request.get_full_path()}) + action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id]) + return page.serve_password_required_response(request, form, action_url) hooks.register('before_serve_page', check_view_restrictions) From cae0d8fecbcfb428ecc0130045ab6bdfee463269 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 5 Jun 2014 11:04:37 +0100 Subject: [PATCH 211/298] add public/private indicator on explorer and page editor --- .../wagtailadmin/pages/_view_permission_indicator.html | 6 ++++++ wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html | 3 +++ wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html | 5 ++++- wagtail/wagtailcore/models.py | 3 +++ wagtail/wagtailcore/wagtail_hooks.py | 3 +-- 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html new file mode 100644 index 000000000..7f9c7d82b --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html @@ -0,0 +1,6 @@ +{% load i18n %} +{% if page.get_view_restrictions %} +
                {% trans 'Private' %}
                +{% else %} +
                {% trans 'Public' %}
                +{% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html index 8cc7fdca6..e56ad170c 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html @@ -16,6 +16,9 @@
                {% trans "Status:" %} {% if page.live %}{{ page.status_string }}{% else %}{{ page.status_string }}{% endif %}
                + + {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page only %} +
              diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html index 7258c5429..5fe32838e 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html @@ -48,6 +48,9 @@ {% else %}

              {{ parent_page.title }}

              {% endif %} + + {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=parent_page only %} +
                {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
              • {% trans 'Edit' %}
                • @@ -249,4 +252,4 @@
            -{% endif %} \ No newline at end of file +{% endif %} diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 08e1b612b..8670f0315 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -811,6 +811,9 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): def get_prev_siblings(self, inclusive=False): return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path') + def get_view_restrictions(self): + return PageViewRestriction.objects.filter(page__in=self.get_ancestors(inclusive=True)) + password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html') def serve_password_required_response(self, request, form, action_url): """ diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py index b2ab31248..e92971c99 100644 --- a/wagtail/wagtailcore/wagtail_hooks.py +++ b/wagtail/wagtailcore/wagtail_hooks.py @@ -1,11 +1,10 @@ from django.core.urlresolvers import reverse from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import PageViewRestriction from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm def check_view_restrictions(page, request): - restrictions = PageViewRestriction.objects.filter(page__in=page.get_ancestors(inclusive=True)) + restrictions = page.get_view_restrictions() if restrictions: passed_restrictions = request.session.get('passed_page_view_restrictions', []) From eaee2b9695842f4c38a79874a55eec1e0aeb4065 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 6 Jun 2014 12:52:34 +0100 Subject: [PATCH 212/298] Implement (mostly-empty) views for setting view restrictions, accessible from the permission indicator --- .../js/view-permission-indicator.js | 9 +++++ .../ancestor_restriction.html | 8 +++++ .../set_view_restrictions.html | 7 ++++ .../wagtailadmin/pages/_editor_js.html | 1 + .../pages/_view_permission_indicator.html | 25 ++++++++++--- .../templates/wagtailadmin/pages/edit.html | 6 ++-- .../templates/wagtailadmin/pages/index.html | 4 +++ .../templates/wagtailadmin/pages/list.html | 2 +- wagtail/wagtailadmin/urls.py | 4 ++- .../views/page_view_restrictions.py | 35 +++++++++++++++++++ wagtail/wagtailcore/models.py | 3 ++ 11 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html create mode 100644 wagtail/wagtailadmin/views/page_view_restrictions.py diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js new file mode 100644 index 000000000..52b7442a7 --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js @@ -0,0 +1,9 @@ +$(function() { + /* Interface to set view permissions from the explorer / editor */ + $('a.action-set-view-permissions').click(function() { + ModalWorkflow({ + 'url': this.href + }); + return false; + }); +}); diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html new file mode 100644 index 000000000..d8b652f32 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html @@ -0,0 +1,8 @@ +{% load i18n %} +{% trans "Access restricted" as title_str %} +{% include "wagtailadmin/shared/header.html" with title=title_str %} + +
            + {% trans "Access to this page is restricted because it is within the section:" %} + {{ page_with_restriction.title }} +
            diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html new file mode 100644 index 000000000..82e928c68 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html @@ -0,0 +1,7 @@ +{% load i18n %} +{% trans "Set access restrictions" as title_str %} +{% include "wagtailadmin/shared/header.html" with title=title_str %} + +
            +

            form for setting access restrictions goes here

            +
            diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index 17bcbd8bf..f494f75ec 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -21,6 +21,7 @@ + {% hook_output 'insert_editor_js' %} {% endcompress %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html index 7f9c7d82b..030703aab 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html @@ -1,6 +1,21 @@ -{% load i18n %} -{% if page.get_view_restrictions %} -
            {% trans 'Private' %}
            -{% else %} -
            {% trans 'Public' %}
            +{% load i18n wagtailadmin_tags %} + +{% if not page_perms %} + {% page_permissions page as page_perms %} {% endif %} + +{% with page.get_view_restrictions as has_view_restrictions %} + {% if has_view_restrictions %} + {% trans 'Private' as label %} + {% else %} + {% trans 'Public' as label %} + {% endif %} + + {% if page_perms.can_set_view_restrictions %} + + {% else %} +
            {{ label }}
            + {% endif %} +{% endwith %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html index e56ad170c..a1b108933 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html @@ -6,6 +6,7 @@ {% block bodyclass %}menu-explorer page-editor{% endblock %} {% block content %} + {% page_permissions page as page_perms %}
            {% include "wagtailadmin/shared/breadcrumb.html" with page=page %} @@ -17,7 +18,7 @@ {% trans "Status:" %} {% if page.live %}{{ page.status_string }}{% else %}{{ page.status_string }}{% endif %}
            • - {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page only %} + {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page page_perms=page_perms only %}
            @@ -25,8 +26,7 @@
            {% csrf_token %} {{ edit_handler.render_form_content }} - - {% page_permissions page as page_perms %} +
            • diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html index c7190bb84..0f5c25f38 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html @@ -21,6 +21,10 @@ {% endblock %} {% block extra_js %} + {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %} + + + diff --git a/wagtail/wagtailadmin/views/page_view_restrictions.py b/wagtail/wagtailadmin/views/page_view_restrictions.py index 481ad9ae8..e36e9900d 100644 --- a/wagtail/wagtailadmin/views/page_view_restrictions.py +++ b/wagtail/wagtailadmin/views/page_view_restrictions.py @@ -39,7 +39,9 @@ def set_view_restrictions(request, page_id): page=page, password = form.cleaned_data['password']) return render_modal_workflow( - request, None, 'wagtailadmin/page_view_restrictions/set_view_restrictions_done.js' + request, None, 'wagtailadmin/page_view_restrictions/set_view_restrictions_done.js', { + 'is_public': (form.cleaned_data['restriction_type'] == 'none') + } ) else: # request is a GET From 47c0a197c8392bb216ff4e30bb6ea648e423ab96 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 6 Jun 2014 16:53:25 +0100 Subject: [PATCH 215/298] make password a required field when restriction_type = password --- wagtail/wagtailadmin/forms.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py index 3878eb473..f3634faf0 100644 --- a/wagtail/wagtailadmin/forms.py +++ b/wagtail/wagtailadmin/forms.py @@ -83,3 +83,12 @@ class PageViewRestrictionForm(forms.Form): ('password', ugettext_lazy("This page is only viewable to users who enter this password:")), ], widget=forms.RadioSelect) password = forms.CharField(required=False) + + def clean(self): + cleaned_data = super(PageViewRestrictionForm, self).clean() + + if cleaned_data.get('restriction_type') == 'password' and not cleaned_data.get('password'): + self._errors["password"] = self.error_class([_('This field is required.')]) + del cleaned_data['password'] + + return cleaned_data From 9f460bff05176a3cebe2b5fea04b9419d63880b1 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 6 Jun 2014 17:09:12 +0100 Subject: [PATCH 216/298] move check_view_restrictions into the Page model, so that sites with non-standard routing requirements can use it independently of the before_serve_page hook --- wagtail/wagtailcore/models.py | 24 ++++++++++++++++++++++-- wagtail/wagtailcore/wagtail_hooks.py | 15 +-------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index df88a8b22..c6cb095a1 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -9,12 +9,11 @@ from modelcluster.models import ClusterableModel from django.db import models, connection, transaction from django.db.models import get_model, Q -from django.db.models.signals import post_save -from django.dispatch import receiver from django.http import Http404 from django.core.cache import cache from django.core.handlers.wsgi import WSGIRequest from django.core.handlers.base import BaseHandler +from django.core.urlresolvers import reverse from django.contrib.contenttypes.models import ContentType from django.contrib.auth.models import Group from django.conf import settings @@ -812,8 +811,29 @@ class Page(six.with_metaclass(PageBase, MP_Node, ClusterableModel, Indexed)): return self.get_siblings(inclusive).filter(path__lte=self.path).order_by('-path') def get_view_restrictions(self): + """Return a query set of all page view restrictions that apply to this page""" return PageViewRestriction.objects.filter(page__in=self.get_ancestors(inclusive=True)) + def check_view_restrictions(self, request): + """ + Check whether there are any view restrictions on this page which are + not fulfilled by the given request object. If there are, return an + HttpResponse that will notify the user of that restriction (and possibly + include a password / login form that will allow them to proceed). If + there are no such restrictions, return None + """ + restrictions = self.get_view_restrictions() + + if restrictions: + passed_restrictions = request.session.get('passed_page_view_restrictions', []) + for restriction in restrictions: + if restriction.id not in passed_restrictions: + from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm + form = PasswordPageViewRestrictionForm(instance=restriction, + initial={'return_url': request.get_full_path()}) + action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, self.id]) + return self.serve_password_required_response(request, form, action_url) + password_required_template = getattr(settings, 'PASSWORD_REQUIRED_TEMPLATE', 'wagtailcore/password_required.html') def serve_password_required_response(self, request, form, action_url): """ diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/wagtailcore/wagtail_hooks.py index e92971c99..3763c881b 100644 --- a/wagtail/wagtailcore/wagtail_hooks.py +++ b/wagtail/wagtailcore/wagtail_hooks.py @@ -1,18 +1,5 @@ -from django.core.urlresolvers import reverse - from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.forms import PasswordPageViewRestrictionForm def check_view_restrictions(page, request): - restrictions = page.get_view_restrictions() - - if restrictions: - passed_restrictions = request.session.get('passed_page_view_restrictions', []) - for restriction in restrictions: - if restriction.id not in passed_restrictions: - form = PasswordPageViewRestrictionForm(instance=restriction, - initial={'return_url': request.get_full_path()}) - action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id]) - return page.serve_password_required_response(request, form, action_url) - + return page.check_view_restrictions(request) hooks.register('before_serve_page', check_view_restrictions) From 1ee707f4052a8e0b26823918e423b1ca43087bc6 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 6 Jun 2014 17:15:50 +0100 Subject: [PATCH 217/298] Add note that access restrictions will take effect on child pages --- .../page_view_restrictions/set_view_restrictions.html | 1 + 1 file changed, 1 insertion(+) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html index f3efa3699..632c34f1b 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html @@ -27,4 +27,5 @@
            +

            {% trans "Access restrictions will take effect on this page and all child pages." %}

      From 9e94c83843c2feeec597a2a8b65b8e061f6812f8 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 9 Jun 2014 14:08:39 +0100 Subject: [PATCH 218/298] Add 'private' indicator in page chooser for pages with view restrictions --- .../pages/_view_permission_indicator.html | 31 +++++++++---------- .../templates/wagtailadmin/pages/list.html | 10 ++++++ .../templatetags/wagtailadmin_tags.py | 22 ++++++++++++- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html index ee6a7e3b4..5bb8853e0 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html @@ -1,24 +1,23 @@ {% load i18n wagtailadmin_tags %} +{% test_page_is_public page as is_public %} {% if not page_perms %} {% page_permissions page as page_perms %} {% endif %} -{% with page.get_view_restrictions as has_view_restrictions %} - {% if page_perms.can_set_view_restrictions %} -
      - - {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #} - {% trans 'Public' %} - {% trans 'Private' %} - -
      +{% if page_perms.can_set_view_restrictions %} +
      + + {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #} + {% trans 'Public' %} + {% trans 'Private' %} + +
      +{% else %} + {# Read-only display, for users who don't have permission to set view restrictions #} + {% if is_public %} +
      {% trans 'Public' %}
      {% else %} - {# Read-only display, for users who don't have permission to set view restrictions #} - {% if has_view_restrictions %} -
      {% trans 'Private' %}
      - {% else %} -
      {% trans 'Public' %}
      - {% endif %} +
      {% trans 'Private' %}
      {% endif %} -{% endwith %} +{% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html index a1d827c43..44b058e83 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html @@ -42,6 +42,11 @@ {% else %}

      {{ parent_page.title }}

      {% endif %} + + {% test_page_is_public parent_page as is_public %} + {% if not is_public %} + (private) + {% endif %} {% else %} {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}

      {{ parent_page.title }}

      @@ -155,6 +160,11 @@ {% else %} {{ page.title }} {% endif %} + + {% test_page_is_public page as is_public %} + {% if not is_public %} + (private) + {% endif %} {% else %} {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %} {{ page.title }} diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py index f3c871507..a6467532d 100644 --- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py +++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py @@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy +from wagtail.wagtailcore.models import get_navigation_menu_items, UserPagePermissionsProxy, PageViewRestriction from wagtail.wagtailcore.utils import camelcase_to_underscore @@ -88,6 +88,26 @@ def page_permissions(context, page): return context['user_page_permissions'].for_page(page) +@register.assignment_tag(takes_context=True) +def test_page_is_public(context, page): + """ + Usage: {% test_page_is_public page as is_public %} + Sets 'is_public' to True iff there are no page view restrictions in place on + this page. + Caches the list of page view restrictions in the context, to avoid repeated + DB queries on repeated calls. + """ + if 'all_page_view_restriction_paths' not in context: + context['all_page_view_restriction_paths'] = PageViewRestriction.objects.select_related('page').values_list('page__path', flat=True) + + is_private = any([ + page.path.startswith(restricted_path) + for restricted_path in context['all_page_view_restriction_paths'] + ]) + + return not is_private + + @register.simple_tag def hook_output(hook_name): """ From ff33a00deb035063c2ff0809a4dea2eb3d48902e Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 10 Jun 2014 14:33:08 +0100 Subject: [PATCH 219/298] 'view restrictions' renamed 'privacy' and general wagtail styling of privacy status completed --- wagtail/wagtailadmin/forms.py | 6 +- .../wagtailadmin/js/privacy-indicator.js | 18 +++++ .../js/view-permission-indicator.js | 18 ----- .../scss/components/formatters.scss | 19 +++++- .../wagtailadmin/scss/components/forms.scss | 6 ++ .../wagtailadmin/scss/components/header.scss | 10 ++- .../wagtailadmin/scss/components/listing.scss | 5 ++ .../components/view-permission-indicator.scss | 8 --- .../static/wagtailadmin/scss/normalize.css | 9 --- .../page_privacy/ancestor_privacy.html | 8 +++ .../page_privacy/set_privacy.html | 16 +++++ .../set_privacy.js} | 0 .../set_privacy_done.js} | 0 .../ancestor_restriction.html | 8 --- .../set_view_restrictions.html | 31 --------- .../wagtailadmin/pages/_editor_css.html | 1 - .../wagtailadmin/pages/_editor_js.html | 2 +- .../pages/_privacy_indicator.html | 23 +++++++ .../pages/_view_permission_indicator.html | 23 ------- .../templates/wagtailadmin/pages/edit.html | 12 ++-- .../templates/wagtailadmin/pages/index.html | 9 +-- .../templates/wagtailadmin/pages/list.html | 65 ++++++++++++------- .../templatetags/wagtailadmin_tags.py | 5 +- wagtail/wagtailadmin/urls.py | 4 +- ...e_view_restrictions.py => page_privacy.py} | 10 +-- 25 files changed, 161 insertions(+), 155 deletions(-) create mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js delete mode 100644 wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html rename wagtail/wagtailadmin/templates/wagtailadmin/{page_view_restrictions/set_view_restrictions.js => page_privacy/set_privacy.js} (100%) rename wagtail/wagtailadmin/templates/wagtailadmin/{page_view_restrictions/set_view_restrictions_done.js => page_privacy/set_privacy_done.js} (100%) delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html rename wagtail/wagtailadmin/views/{page_view_restrictions.py => page_privacy.py} (87%) diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py index f3634faf0..e9b10f63c 100644 --- a/wagtail/wagtailadmin/forms.py +++ b/wagtail/wagtailadmin/forms.py @@ -78,9 +78,9 @@ class PasswordResetForm(PasswordResetForm): class PageViewRestrictionForm(forms.Form): - restriction_type = forms.ChoiceField(choices=[ - ('none', ugettext_lazy("This page is viewable by all visitors")), - ('password', ugettext_lazy("This page is only viewable to users who enter this password:")), + restriction_type = forms.ChoiceField(label="Visibility", choices=[ + ('none', ugettext_lazy("Public")), + ('password', ugettext_lazy("Private, accessible with the following password")), ], widget=forms.RadioSelect) password = forms.CharField(required=False) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js new file mode 100644 index 000000000..eb280f00e --- /dev/null +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js @@ -0,0 +1,18 @@ +$(function() { + /* Interface to set permissions from the explorer / editor */ + $('a.action-set-privacy').click(function() { + ModalWorkflow({ + 'url': this.href, + 'responses': { + 'setPermission': function(isPublic) { + if (isPublic) { + $('.privacy-indicator').removeClass('private').addClass('public'); + } else { + $('.privacy-indicator').removeClass('public').addClass('private'); + } + } + } + }); + return false; + }); +}); diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js deleted file mode 100644 index 5e84e0840..000000000 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/view-permission-indicator.js +++ /dev/null @@ -1,18 +0,0 @@ -$(function() { - /* Interface to set view permissions from the explorer / editor */ - $('a.action-set-view-permissions').click(function() { - ModalWorkflow({ - 'url': this.href, - 'responses': { - 'setPermission': function(isPublic) { - if (isPublic) { - $('.view-permission-indicator').removeClass('private').addClass('public'); - } else { - $('.view-permission-indicator').removeClass('public').addClass('private'); - } - } - } - }); - return false; - }); -}); diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss index 97e915f36..b88c4fd60 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/formatters.scss @@ -121,8 +121,8 @@ color:lighten($color-grey-2,30%); -webkit-font-smoothing: auto; font-size:0.80em; - margin:0 0.5em; - background:white url("#{$static-root}bg-dark-diag.svg"); + margin:0 0.5em 0.5em; + background:white url( "#{$static-root}bg-dark-diag.svg"); &.primary{ color:$color-grey-2; @@ -136,6 +136,20 @@ a.status-tag.primary:hover{ color:$color-teal; } +.privacy-indicator { + &.public { + .label-private { + display: none; + } + } + &.private { + .label-public { + display: none; + } + } +} + + /* free tagging tags from taggit */ .tag{ background-color:$color-teal; @@ -174,6 +188,7 @@ a.tag:hover{ } } + /* make a block-level element inline */ .inline{ display:inline; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss index 3a8f67ba2..d71ff66da 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss @@ -69,6 +69,10 @@ input, textarea, select, .richtext, .tagit{ outline:none; background-color:$color-input-focus; } + &:disabled, &[disabled], &:disabled:hover, &[disabled]:hover{ + background-color:inherit; + cursor:not-allowed; + } } /* select boxes */ @@ -135,6 +139,7 @@ input[type=radio]:before{ display:block; content:"K"; width: 1em; + height:1em; line-height: 1.1em; padding: 4px; background-color: white; @@ -741,6 +746,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{ .choice_field &, .model_multiple_choice_field &, .boolean_field &, + .choice_field &, .model_choice_field &, .image_field &, .file_field &{ diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss index 3f079897f..1e9905d27 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/header.scss @@ -5,6 +5,10 @@ header{ margin-bottom:2em; color:white; + a{ + color:white; + } + h1, h2{ margin:0; color:white; @@ -97,12 +101,6 @@ header{ } } -.page-explorer header{ - margin-bottom:0; - padding-bottom:0em; -} - - @media screen and (min-width: $breakpoint-mobile){ header{ padding-top:1.5em; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss index 9d940362a..8a5baa8d3 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss @@ -379,6 +379,11 @@ table.listing{ } } + .privacy-indicator{ + font-size:0.9em; + opacity:0.7; + } + .table-headers{ .ord{ padding-right:0; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss deleted file mode 100644 index 8e26eaf74..000000000 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/view-permission-indicator.scss +++ /dev/null @@ -1,8 +0,0 @@ -.view-permission-indicator { - &.public { - .label-private { display: none; } - } - &.private { - .label-public { display: none; } - } -} diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css b/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css index 8d57e3c96..8d945b3ec 100755 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/normalize.css @@ -452,15 +452,6 @@ input[type="submit"] { *overflow: visible; /* 4 */ } -/** - * Re-set default cursor for disabled elements. - */ - -button[disabled], -html input[disabled] { - cursor: default; -} - /** * 1. Address box sizing set to content-box in IE 8/9. * 2. Remove excess padding in IE 8/9. diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html new file mode 100644 index 000000000..b1471ba25 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html @@ -0,0 +1,8 @@ +{% load i18n %} +{% trans "Page privacy" as title_str %} +{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %} + +
      +

      {% trans "This page has been made private by a parent page." %}

      +

      {% trans "You can edit the privacy settings on:" %} {{ page_with_restriction.title }} +

      diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html new file mode 100644 index 000000000..6298d6f5f --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html @@ -0,0 +1,16 @@ +{% load i18n %} +{% trans "Page privacy" as title_str %} +{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %} + +
      +

      {% trans "Note: privacy changes apply to all children of this page too." %}

      +
      + {% csrf_token %} +
        + {% include "wagtailadmin/shared/field_as_li.html" with field=form.restriction_type %} + {% include "wagtailadmin/shared/field_as_li.html" with field=form.password li_classes="password-field" %} +
      + +
      + +
      diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.js rename to wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js similarity index 100% rename from wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions_done.js rename to wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy_done.js diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html deleted file mode 100644 index d8b652f32..000000000 --- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/ancestor_restriction.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load i18n %} -{% trans "Access restricted" as title_str %} -{% include "wagtailadmin/shared/header.html" with title=title_str %} - -
      - {% trans "Access to this page is restricted because it is within the section:" %} - {{ page_with_restriction.title }} -
      diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html deleted file mode 100644 index 632c34f1b..000000000 --- a/wagtail/wagtailadmin/templates/wagtailadmin/page_view_restrictions/set_view_restrictions.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load i18n %} -{% trans "Set access restrictions" as title_str %} -{% include "wagtailadmin/shared/header.html" with title=title_str %} - -
      -
      - {% csrf_token %} -
        -
      • - {# 'This page is viewable by all visitors' #} - {{ form.restriction_type.0 }} -
        • -
      • - {# 'This page is only viewable to users who enter this password:' #} - {{ form.restriction_type.1 }} - - {# FIXME: need distinct CSS styling for the 'disabled' state #} - {{ form.password }} - {% if form.password.errors %} -

        - {% for error in form.password.errors %} - {{ error }} - {% endfor %} -

        - {% endif %} -
        • -
      - -
      -

      {% trans "Access restrictions will take effect on this page and all child pages." %}

      -
      diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html index 58d7d5f17..2e140c89c 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_css.html @@ -7,7 +7,6 @@ {% compress css %} - {# we'll want tag-it included, for the benefit of any modals that use it, like images. #} {# TODO: a method of injecting these sorts of things on demand when the modal is spawned #} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index f494f75ec..a3185e096 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -21,7 +21,7 @@ - + {% hook_output 'insert_editor_js' %} {% endcompress %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html new file mode 100644 index 000000000..53aa44800 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html @@ -0,0 +1,23 @@ +{% load i18n wagtailadmin_tags %} + +{% test_page_is_public page as is_public %} +{% if not page_perms %} + {% page_permissions page as page_perms %} +{% endif %} + +
      + {% trans "Privacy" %} + {% if page_perms.can_set_view_restrictions %} + + {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #} + {% trans 'Public' %} + {% trans 'Private' %} + + {% else %} + {% if is_public %} + {% trans 'Public' %} + {% else %} + {% trans 'Private' %} + {% endif %} + {% endif %} +
      diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html deleted file mode 100644 index 5bb8853e0..000000000 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_view_permission_indicator.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load i18n wagtailadmin_tags %} - -{% test_page_is_public page as is_public %} -{% if not page_perms %} - {% page_permissions page as page_perms %} -{% endif %} - -{% if page_perms.can_set_view_restrictions %} -
      - - {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #} - {% trans 'Public' %} - {% trans 'Private' %} - -
      -{% else %} - {# Read-only display, for users who don't have permission to set view restrictions #} - {% if is_public %} -
      {% trans 'Public' %}
      - {% else %} -
      {% trans 'Private' %}
      - {% endif %} -{% endif %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html index a1b108933..c15efbd59 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html @@ -15,11 +15,15 @@

      {% blocktrans with title=page.title %}Editing {{ title }}{% endblocktrans %}

    • - {% trans "Status:" %} {% if page.live %}{{ page.status_string }}{% else %}{{ page.status_string }}{% endif %} + {% trans "Status" %} + {% if page.live %} + {{ page.status_string }} + {% else %} + {{ page.status_string }} + {% endif %} + + {% include "wagtailadmin/pages/_privacy_indicator.html" with page=page page_perms=page_perms only %}
    - - {% include "wagtailadmin/pages/_view_permission_indicator.html" with page=page page_perms=page_perms only %} - diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html index e9e4847dd..3a3aa49a7 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html @@ -16,19 +16,12 @@ {% page_permissions parent_page as parent_page_perms %} {% include "wagtailadmin/pages/list.html" with sortable=1 allow_navigation=1 full_width=1 parent_page=parent_page orderable=parent_page_perms.can_reorder_children %} - -{% endblock %} - -{% block extra_css %} - {% compress css %} - - {% endcompress %} {% endblock %} {% block extra_js %} {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %} - +