diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 428: Use "longerusername" Django module to get >30 char username support.

Message ID 20130916084042.24117.64059.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Paul Sokolovsky Sept. 16, 2013, 8:40 a.m. UTC 
Merge authors:
  Paul Sokolovsky (pfalcon)
Related merge proposals:
  https://code.launchpad.net/~pfalcon/lava-server/longerusername/+merge/184172
  proposed by: Paul Sokolovsky (pfalcon)
  review: Approve - Antonio Terceiro (terceiro)
------------------------------------------------------------
revno: 428 [merge]
committer: Paul Sokolovsky <paul.sokolovsky@linaro.org>
branch nick: lava-server
timestamp: Mon 2013-09-16 11:39:00 +0300
message:
  Use "longerusername" Django module to get >30 char username support.
modified:
  lava_server/settings/common.py
  lava_server/urls.py
  setup.py


--
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk

You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_server/settings/common.py'
--- lava_server/settings/common.py	2013-08-05 17:39:08 +0000
+++ lava_server/settings/common.py	2013-09-05 18:21:58 +0000
@@ -126,6 +126,7 @@ 
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     # Admin docs disabled due to: https://code.djangoproject.com/ticket/6681
+    'longerusername',
     'linaro_django_xmlrpc',
     'lava_markitup',  # Support app for MarkItUp in LAVA
     'south',

=== modified file 'lava_server/urls.py'
--- lava_server/urls.py	2013-07-19 16:03:39 +0000
+++ lava_server/urls.py	2013-09-05 18:21:58 +0000
@@ -21,6 +21,7 @@ 
     handler404, include, patterns, url)
 from django.contrib import admin
 from staticfiles.urls import staticfiles_urlpatterns
+from longerusername.forms import AuthenticationForm
 from linaro_django_xmlrpc import urls as api_urls
 
 from lava_server.extension import loader
@@ -46,8 +47,12 @@ 
     url(r'^{mount_point}version/$'.format(mount_point=settings.MOUNT_POINT),
         version,
         name='lava.version_details'),
-    url(r'^{mount_point}accounts/'.format(mount_point=settings.MOUNT_POINT),
-        include('django.contrib.auth.urls')),
+
+    url(r'^{mount_point}accounts/login/$'.format(mount_point=settings.MOUNT_POINT),
+        'django.contrib.auth.views.login', {'authentication_form': AuthenticationForm}),
+    url(r'^{mount_point}accounts/logout/$'.format(mount_point=settings.MOUNT_POINT),
+        'django.contrib.auth.views.logout'),
+
     url(r'^{mount_point}admin/'.format(mount_point=settings.MOUNT_POINT),
         include(admin.site.urls)),
     url(r'^{mount_point}openid/'.format(mount_point=settings.MOUNT_POINT),

=== modified file 'setup.py'
--- setup.py	2013-07-25 23:02:35 +0000
+++ setup.py	2013-09-05 18:21:58 +0000
@@ -73,6 +73,7 @@ 
         'south >= 0.7.3',
         'versiontools >= 1.8',
         'markdown >= 2.0.3',
+        'longerusername',
 
         # optional dependency; for authentication with Attlassian Crowd SSO
         # 'django-crowd-rest-backend >= 0.3,