# HG changeset patch # User ymh # Date 1436967815 -7200 # Node ID eb55bae28748d260855886bafad532e68ee43207 # Parent 8aff7e66e4c7f30d15f0a0735a80a4d7fe31557a remove ref to ldtplatform in platform diff -r 8aff7e66e4c7 -r eb55bae28748 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Fri May 29 00:51:04 2015 +0200 +++ b/.settings/org.eclipse.core.resources.prefs Wed Jul 15 15:43:35 2015 +0200 @@ -15,5 +15,6 @@ encoding//src/ldt/ldt/management/utils.py=utf-8 encoding//src/ldt/ldt/test/test_runner.py=utf-8 encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8 encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8 encoding/=UTF-8 diff -r 8aff7e66e4c7 -r eb55bae28748 src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Fri May 29 00:51:04 2015 +0200 +++ b/src/ldt/ldt/__init__.py Wed Jul 15 15:43:35 2015 +0200 @@ -1,6 +1,6 @@ __all__ = ["VERSION", "get_version", "__version__"] -VERSION = (1, 56, 03, "final", 0) +VERSION = (1, 56, 04, "final", 0) def get_version(): diff -r 8aff7e66e4c7 -r eb55bae28748 src/ldt/ldt/ldt_utils/views/embed/v1/views.py --- a/src/ldt/ldt/ldt_utils/views/embed/v1/views.py Fri May 29 00:51:04 2015 +0200 +++ b/src/ldt/ldt/ldt_utils/views/embed/v1/views.py Wed Jul 15 15:43:35 2015 +0200 @@ -5,8 +5,8 @@ class ConfigViewV1(ConfigView): template_name = "ldt/ldt_utils/embed/v1/mdplayer_config.html" - iframe_base_url = reverse_lazy("embed_iframe_v1", urlconf="ldtplatform.urls") + iframe_base_url = reverse_lazy("embed_iframe_v1")#, urlconf="ldtplatform.urls") class IframeViewV1(IframeView): template_name = "ldt/ldt_utils/embed/v1/iframe.html" - iframe_base_url = reverse_lazy("embed_iframe_v1", urlconf="ldtplatform.urls") \ No newline at end of file + iframe_base_url = reverse_lazy("embed_iframe_v1")#, urlconf="ldtplatform.urls") \ No newline at end of file diff -r 8aff7e66e4c7 -r eb55bae28748 src/ldt/ldt/ldt_utils/views/embed/v2/views.py --- a/src/ldt/ldt/ldt_utils/views/embed/v2/views.py Fri May 29 00:51:04 2015 +0200 +++ b/src/ldt/ldt/ldt_utils/views/embed/v2/views.py Wed Jul 15 15:43:35 2015 +0200 @@ -15,11 +15,11 @@ class ConfigViewV2(ConfigView): template_name = "ldt/ldt_utils/embed/v2/mdplayer_config.html" - iframe_base_url = reverse_lazy("embed_iframe_v2", urlconf="ldtplatform.urls") + iframe_base_url = reverse_lazy("embed_iframe_v2")#, urlconf="ldtplatform.urls") class IframeViewV2(IframeView): template_name = "ldt/ldt_utils/embed/v2/iframe.html" - iframe_base_url = reverse_lazy("embed_iframe_v2", urlconf="ldtplatform.urls") + iframe_base_url = reverse_lazy("embed_iframe_v2")#, urlconf="ldtplatform.urls") def get(self, request): content_id = request.GET.get("content_id") diff -r 8aff7e66e4c7 -r eb55bae28748 src/ldt/ldt/user/migrations/0001_initial.py --- a/src/ldt/ldt/user/migrations/0001_initial.py Fri May 29 00:51:04 2015 +0200 +++ b/src/ldt/ldt/user/migrations/0001_initial.py Wed Jul 15 15:43:35 2015 +0200 @@ -31,10 +31,12 @@ ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), ('language', models.CharField(default=ldt.user.models.get_ldtuser_language_default, max_length=2)), ('image', sorl.thumbnail.fields.ImageField(default=ldt.user.models.get_ldtuser_image_default, max_length=200, upload_to=b'thumbnails/users/')), - ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups')), - ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')), + ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to=b'auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to=b'auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')), ], options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', 'permissions': ((),), }, ), @@ -47,4 +49,8 @@ ('group', models.OneToOneField(related_name='profile', to='auth.Group')), ], ), + migrations.AlterModelOptions( + name='ldtuser', + options={'verbose_name': 'user', 'verbose_name_plural': 'users'}, + ), ] diff -r 8aff7e66e4c7 -r eb55bae28748 src/ldt/ldt/user/models.py --- a/src/ldt/ldt/user/models.py Fri May 29 00:51:04 2015 +0200 +++ b/src/ldt/ldt/user/models.py Wed Jul 15 15:43:35 2015 +0200 @@ -10,7 +10,7 @@ from south.signals import post_migrate -class LdtUserManager(BaseUserManager): +class LdtUserManager(BaseUserManager): def create_user(self, username, email=None, password=None, **extra_fields): """