mirror of
https://github.com/Hopiu/wagtail.git
synced 2026-05-11 00:33:17 +00:00
Python 3-related changes
This commit is contained in:
Nick Smith
parent
b0c094f377
commit
37c1a3db27
2 changed files with 76 additions and 73 deletions
|
|
@ -1,4 +1,5 @@
|
|||
# -*- 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,70 +10,70 @@ class Migration(SchemaMigration):
|
|||
|
||||
def forwards(self, orm):
|
||||
# Adding unique constraint on 'GroupPagePermission', fields ['group', 'page', 'permission_type']
|
||||
db.create_unique(u'wagtailcore_grouppagepermission', ['group_id', 'page_id', 'permission_type'])
|
||||
db.create_unique('wagtailcore_grouppagepermission', ['group_id', 'page_id', 'permission_type'])
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Removing unique constraint on 'GroupPagePermission', fields ['group', 'page', 'permission_type']
|
||||
db.delete_unique(u'wagtailcore_grouppagepermission', ['group_id', 'page_id', 'permission_type'])
|
||||
db.delete_unique('wagtailcore_grouppagepermission', ['group_id', 'page_id', 'permission_type'])
|
||||
|
||||
|
||||
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': {'unique_together': "(('group', 'page', 'permission_type'),)", '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'}),
|
||||
|
|
@ -81,30 +82,30 @@ 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.pageviewrestriction': {
|
||||
'wagtailcore.pageviewrestriction': {
|
||||
'Meta': {'object_name': 'PageViewRestriction'},
|
||||
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'view_restrictions'", 'to': u"orm['wagtailcore.Page']"}),
|
||||
'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'})
|
||||
},
|
||||
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']"})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['wagtailcore']
|
||||
complete_apps = ['wagtailcore']
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
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
|
||||
|
|
@ -6,6 +7,7 @@ from wagtail.tests.utils import WagtailTestUtils
|
|||
from wagtail.wagtailcore import hooks
|
||||
from wagtail.wagtailusers.models import UserProfile
|
||||
from wagtail.wagtailcore.models import Page, GroupPagePermission
|
||||
import six
|
||||
|
||||
|
||||
class TestUserIndexView(TestCase, WagtailTestUtils):
|
||||
|
|
@ -169,11 +171,11 @@ class TestGroupCreateView(TestCase, WagtailTestUtils):
|
|||
|
||||
def post(self, post_data={}):
|
||||
post_defaults = {
|
||||
u'page_permissions-TOTAL_FORMS': [u'0'],
|
||||
u'page_permissions-MAX_NUM_FORMS': [u'1000'],
|
||||
u'page_permissions-INITIAL_FORMS': [u'0'],
|
||||
'page_permissions-TOTAL_FORMS': ['0'],
|
||||
'page_permissions-MAX_NUM_FORMS': ['1000'],
|
||||
'page_permissions-INITIAL_FORMS': ['0'],
|
||||
}
|
||||
for k, v in post_defaults.iteritems():
|
||||
for k, v in six.iteritems(post_defaults):
|
||||
post_data[k] = post_data.get(k, v)
|
||||
return self.client.post(reverse('wagtailusers_groups_create'), post_data)
|
||||
|
||||
|
|
@ -195,13 +197,13 @@ class TestGroupCreateView(TestCase, WagtailTestUtils):
|
|||
def test_group_create_adding_permissions(self):
|
||||
response = self.post({
|
||||
'name': "test group",
|
||||
u'page_permissions-0-id': [u''],
|
||||
u'page_permissions-0-page': [u'1'],
|
||||
u'page_permissions-0-permission_type': [u'publish'],
|
||||
u'page_permissions-1-id': [u''],
|
||||
u'page_permissions-1-page': [u'1'],
|
||||
u'page_permissions-1-permission_type': [u'edit'],
|
||||
u'page_permissions-TOTAL_FORMS': [u'2'],
|
||||
'page_permissions-0-id': [''],
|
||||
'page_permissions-0-page': ['1'],
|
||||
'page_permissions-0-permission_type': ['publish'],
|
||||
'page_permissions-1-id': [''],
|
||||
'page_permissions-1-page': ['1'],
|
||||
'page_permissions-1-permission_type': ['edit'],
|
||||
'page_permissions-TOTAL_FORMS': ['2'],
|
||||
})
|
||||
|
||||
self.assertRedirects(response, reverse('wagtailusers_groups_index'))
|
||||
|
|
@ -213,13 +215,13 @@ class TestGroupCreateView(TestCase, WagtailTestUtils):
|
|||
# Try to submit duplicate page permission entries
|
||||
response = self.post({
|
||||
'name': "test group",
|
||||
u'page_permissions-0-id': [u''],
|
||||
u'page_permissions-0-page': [u'1'],
|
||||
u'page_permissions-0-permission_type': [u'publish'],
|
||||
u'page_permissions-1-id': [u''],
|
||||
u'page_permissions-1-page': [u'1'],
|
||||
u'page_permissions-1-permission_type': [u'publish'],
|
||||
u'page_permissions-TOTAL_FORMS': [u'2'],
|
||||
'page_permissions-0-id': [''],
|
||||
'page_permissions-0-page': ['1'],
|
||||
'page_permissions-0-permission_type': ['publish'],
|
||||
'page_permissions-1-id': [''],
|
||||
'page_permissions-1-page': ['1'],
|
||||
'page_permissions-1-permission_type': ['publish'],
|
||||
'page_permissions-TOTAL_FORMS': ['2'],
|
||||
})
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
|
@ -253,16 +255,16 @@ class TestGroupEditView(TestCase, WagtailTestUtils):
|
|||
|
||||
def post(self, post_data={}, group_id=None):
|
||||
post_defaults = {
|
||||
u'name': 'test group',
|
||||
u'permissions': [self.existing_permission.id],
|
||||
u'page_permissions-TOTAL_FORMS': [u'1'],
|
||||
u'page_permissions-MAX_NUM_FORMS': [u'1000'],
|
||||
u'page_permissions-INITIAL_FORMS': [u'1'], # as we have one page permission already
|
||||
u'page_permissions-0-id': [self.root_add_permission.id],
|
||||
u'page_permissions-0-page': [self.root_add_permission.page.id],
|
||||
u'page_permissions-0-permission_type': [self.root_add_permission.permission_type]
|
||||
'name': 'test group',
|
||||
'permissions': [self.existing_permission.id],
|
||||
'page_permissions-TOTAL_FORMS': ['1'],
|
||||
'page_permissions-MAX_NUM_FORMS': ['1000'],
|
||||
'page_permissions-INITIAL_FORMS': ['1'], # as we have one page permission already
|
||||
'page_permissions-0-id': [self.root_add_permission.id],
|
||||
'page_permissions-0-page': [self.root_add_permission.page.id],
|
||||
'page_permissions-0-permission_type': [self.root_add_permission.permission_type]
|
||||
}
|
||||
for k, v in post_defaults.iteritems():
|
||||
for k, v in six.iteritems(post_defaults):
|
||||
post_data[k] = post_data.get(k, v)
|
||||
return self.client.post(reverse('wagtailusers_groups_edit', args=(group_id or self.test_group.id, )), post_data)
|
||||
|
||||
|
|
@ -305,13 +307,13 @@ class TestGroupEditView(TestCase, WagtailTestUtils):
|
|||
# The test group has one page permission to begin with
|
||||
self.assertEqual(self.test_group.page_permissions.count(), 1)
|
||||
response = self.post({
|
||||
u'page_permissions-1-id': [u''],
|
||||
u'page_permissions-1-page': [u'1'],
|
||||
u'page_permissions-1-permission_type': [u'publish'],
|
||||
u'page_permissions-2-id': [u''],
|
||||
u'page_permissions-2-page': [u'1'],
|
||||
u'page_permissions-2-permission_type': [u'edit'],
|
||||
u'page_permissions-TOTAL_FORMS': [u'3'],
|
||||
'page_permissions-1-id': [''],
|
||||
'page_permissions-1-page': ['1'],
|
||||
'page_permissions-1-permission_type': ['publish'],
|
||||
'page_permissions-2-id': [''],
|
||||
'page_permissions-2-page': ['1'],
|
||||
'page_permissions-2-permission_type': ['edit'],
|
||||
'page_permissions-TOTAL_FORMS': ['3'],
|
||||
})
|
||||
|
||||
self.assertRedirects(response, reverse('wagtailusers_groups_index'))
|
||||
|
|
@ -323,7 +325,7 @@ class TestGroupEditView(TestCase, WagtailTestUtils):
|
|||
self.assertEqual(self.test_group.page_permissions.count(), 1)
|
||||
|
||||
response = self.post({
|
||||
u'page_permissions-0-DELETE': [u'1'],
|
||||
'page_permissions-0-DELETE': ['1'],
|
||||
})
|
||||
|
||||
self.assertRedirects(response, reverse('wagtailusers_groups_index'))
|
||||
|
|
@ -355,10 +357,10 @@ class TestGroupEditView(TestCase, WagtailTestUtils):
|
|||
def test_duplicate_page_permissions_error(self):
|
||||
# Try to submit duplicate page permission entries
|
||||
response = self.post({
|
||||
u'page_permissions-1-id': [u''],
|
||||
u'page_permissions-1-page': [self.root_add_permission.page.id],
|
||||
u'page_permissions-1-permission_type': [self.root_add_permission.permission_type],
|
||||
u'page_permissions-TOTAL_FORMS': [u'2'],
|
||||
'page_permissions-1-id': [''],
|
||||
'page_permissions-1-page': [self.root_add_permission.page.id],
|
||||
'page_permissions-1-permission_type': [self.root_add_permission.permission_type],
|
||||
'page_permissions-TOTAL_FORMS': ['2'],
|
||||
})
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
|
|
|||
Loading…
Reference in a new issue