Author: leidel
Date: Sat Sep 27 14:57:08 2008
New Revision: 962
Modified:
trunk/local_apps/account/forms.py
trunk/local_apps/account/urls.py
trunk/local_apps/account/views.py
trunk/local_apps/profiles/models.py
trunk/local_apps/profiles/urls.py
trunk/local_apps/profiles/views.py
trunk/pinax/templates/messages/compose.html
trunk/pinax/templates/projects/project.html
Log:
Removed ProfileForm from account app and any other link to the profiles
app, moved username_autocomplete to profile app, converted tabs to
whitespaces
Modified: trunk/local_apps/account/forms.py
==============================================================================
--- trunk/local_apps/account/forms.py (original)
+++ trunk/local_apps/account/forms.py Sat Sep 27 14:57:08 2008
@@ -18,7 +18,6 @@
from emailconfirmation.models import EmailAddress
from friends.models import JoinInvitation
-from profiles.models import Profile
from account.models import Account
from timezones.forms import TimeZoneField
@@ -109,17 +108,12 @@
if email:
new_user.message_set.create(message=ugettext(u"Confirmation email sent
to %(email)s") % {'email': email})
EmailAddress.objects.add_email(new_user, email)
- profile, is_new = Profile.objects.get_or_create(user=new_user)
- if is_new: profile.save()
return username, password # required for authenticate()
else:
new_user = User.objects.create_user(username, "", password)
if email:
new_user.message_set.create(message=ugettext(u"Confirmation email sent
to %(email)s") % {'email': email})
EmailAddress.objects.add_email(new_user, email)
- # profile app may have user post_save signal for user
integrity, so a profile may already exist
- profile, is_new = Profile.objects.get_or_create(user=new_user)
- if is_new: profile.save()
return username, password # required for authenticate()
@@ -128,15 +122,6 @@
def __init__(self, user=None, *args, **kwargs):
self.user = user
super(UserForm, self).__init__(*args, **kwargs)
-
-class ProfileForm(UserForm):
-
- def __init__(self, *args, **kwargs):
- super(ProfileForm, self).__init__(*args, **kwargs)
- try:
- self.profile = self.user.get_profile()
- except Profile.DoesNotExist:
- self.profile = Profile(user=self.user)
class AccountForm(UserForm):
Modified: trunk/local_apps/account/urls.py
==============================================================================
--- trunk/local_apps/account/urls.py (original)
+++ trunk/local_apps/account/urls.py Sat Sep 27 14:57:08 2008
@@ -13,7 +13,6 @@
url(r'^logout/$', 'django.contrib.auth.views.logout',
{"template_name": "account/logout.html"}, name="acct_logout"),
url(r'^confirm_email/(\w+)/$', 'emailconfirmation.views.confirm_email',
name="acct_confirm_email"),
-
url(r'^username_autocomplete/$', 'account.views.username_autocomplete'),
# ajax validation
(r'^validate/$', 'ajax_validation.views.validate', {'form_class':
SignupForm}, 'signup_form_validate'),
Modified: trunk/local_apps/account/views.py
==============================================================================
--- trunk/local_apps/account/views.py (original)
+++ trunk/local_apps/account/views.py Sat Sep 27 14:57:08 2008
@@ -1,19 +1,15 @@
from django.shortcuts import render_to_response
-from django.http import HttpResponseRedirect, HttpResponse,
HttpResponseForbidden
+from django.http import HttpResponseRedirect
from django.contrib.auth import authenticate
from django.contrib.auth import login as auth_login
from django.template import RequestContext
-from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from django.core.urlresolvers import reverse
from django.contrib.auth.decorators import login_required
-from django.contrib.auth.models import User
from forms import SignupForm, AddEmailForm, LoginForm, ChangePasswordForm,
ResetPasswordForm, ChangeTimezoneForm, ChangeLanguageForm, TwitterForm,
PownceForm
from emailconfirmation.models import EmailAddress, EmailConfirmation
-from friends.models import Friendship
-from profiles.models import Profile
def login(request):
@@ -135,8 +131,6 @@
"form": form,
}, context_instance=RequestContext(request))
-from gravatar.templatetags.gravatar import gravatar
-
@login_required
def other_services(request):
from zwitschern.utils import twitter_verify_credentials
@@ -147,27 +141,27 @@
pownce_authorized = False
if request.method == "POST":
twitter_form = TwitterForm(request.user, request.POST)
-
+
if request.POST['actionType'] == 'saveTwitter':
- if twitter_form.is_valid():
- from zwitschern.utils import twitter_account_raw
- twitter_account =
twitter_account_raw(request.POST['username'], request.POST['password'])
- twitter_authorized =
twitter_verify_credentials(twitter_account)
- if not twitter_authorized:
- request.user.message_set.create(message="Twitter
authentication failed")
- else:
- twitter_form.save()
+ if twitter_form.is_valid():
+ from zwitschern.utils import twitter_account_raw
+ twitter_account =
twitter_account_raw(request.POST['username'], request.POST['password'])
+ twitter_authorized =
twitter_verify_credentials(twitter_account)
+ if not twitter_authorized:
+ request.user.message_set.create(message="Twitter
authentication failed")
+ else:
+ twitter_form.save()
if request.POST['actionType'] == 'savePownce':
- pownce_form = PownceForm(request.user, request.POST)
- if pownce_form.is_valid():
- from zwitschern.pownce_utils import
pownce_account_raw
- pownce_account =
pownce_account_raw(request.POST['usernamep'],
request.POST['passwordp'])
- pownce_authorized =
pownce_verify_credentials(pownce_account)
- if not pownce_authorized:
-
request.user.message_set.create(message="Pownce authentication
failed")
- else:
- pownce_form.save()
+ pownce_form = PownceForm(request.user, request.POST)
+ if pownce_form.is_valid():
+ from zwitschern.pownce_utils import pownce_account_raw
+ pownce_account =
pownce_account_raw(request.POST['usernamep'], request.POST['passwordp'])
+ pownce_authorized =
pownce_verify_credentials(pownce_account)
+ if not pownce_authorized:
+ request.user.message_set.create(message="Pownce
authentication failed")
+ else:
+ pownce_form.save()
else:
from zwitschern.utils import twitter_account_for_user
from zwitschern.pownce_utils import pownce_account_for_user
@@ -183,26 +177,3 @@
"pownce_form": pownce_form,
"pownce_authorized":pownce_authorized,
}, context_instance=RequestContext(request))
-
-def username_autocomplete(request):
- if request.user.is_authenticated():
- q = request.GET.get("q")
- friends = Friendship.objects.friends_for_user(request.user)
- content = []
- for friendship in friends:
- if friendship["friend"].username.lower().startswith(q):
- try:
- profile = friendship["friend"].get_profile()
- entry = "%s,,%s,,%s" % (
- gravatar(friendship["friend"], 40),
- friendship["friend"].username,
- profile.location
- )
- except Profile.DoesNotExist:
- pass
- content.append(entry)
- response = HttpResponse("\n".join(content))
- else:
- response = HttpResponseForbidden()
- setattr(response, "djangologging.suppress_output", True)
- return response
Modified: trunk/local_apps/profiles/models.py
==============================================================================
--- trunk/local_apps/profiles/models.py (original)
+++ trunk/local_apps/profiles/models.py Sat Sep 27 14:57:08 2008
@@ -30,9 +30,9 @@
verbose_name = _('profile')
verbose_name_plural = _('profiles')
-def create_profile(sender, instance=None, **kwdargs):
- if instance is None: return
+def create_profile(sender, instance=None, **kwargs):
+ if instance is None:
+ return
profile, created = Profile.objects.get_or_create(user=instance)
- if created: profile.save()
post_save.connect(create_profile, sender=User)
Modified: trunk/local_apps/profiles/urls.py
==============================================================================
--- trunk/local_apps/profiles/urls.py (original)
+++ trunk/local_apps/profiles/urls.py Sat Sep 27 14:57:08 2008
@@ -3,4 +3,5 @@
urlpatterns = patterns('',
url(r'^$', 'profiles.views.profiles', name='profile_list'),
url(r'^(?P<username>[\w]+)/$', 'profiles.views.profile',
name='profile_detail'),
+
url(r'^username_autocomplete/$', 'profiles.views.username_autocomplete',
name='profile_username_autocomplete'),
)
Modified: trunk/local_apps/profiles/views.py
==============================================================================
--- trunk/local_apps/profiles/views.py (original)
+++ trunk/local_apps/profiles/views.py Sat Sep 27 14:57:08 2008
@@ -1,6 +1,7 @@
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.contrib.auth.models import User
+from django.http import HttpResponse, HttpResponseForbidden
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext
@@ -14,6 +15,8 @@
from profiles.models import Profile
from profiles.forms import ProfileForm
+from gravatar.templatetags.gravatar import gravatar
+
try:
from notification import models as notification
except ImportError:
@@ -116,3 +119,26 @@
"previous_invitations_to": previous_invitations_to,
"previous_invitations_from": previous_invitations_from,
}, context_instance=RequestContext(request))
+
+def username_autocomplete(request):
+ if request.user.is_authenticated():
+ q = request.GET.get("q")
+ friends = Friendship.objects.friends_for_user(request.user)
+ content = []
+ for friendship in friends:
+ if friendship["friend"].username.lower().startswith(q):
+ try:
+ profile = friendship["friend"].get_profile()
+ entry = "%s,,%s,,%s" % (
+ gravatar(friendship["friend"], 40),
+ friendship["friend"].username,
+ profile.location
+ )
+ except Profile.DoesNotExist:
+ pass
+ content.append(entry)
+ response = HttpResponse("\n".join(content))
+ else:
+ response = HttpResponseForbidden()
+ setattr(response, "djangologging.suppress_output", True)
+ return response
Modified: trunk/pinax/templates/messages/compose.html
==============================================================================
--- trunk/pinax/templates/messages/compose.html (original)
+++ trunk/pinax/templates/messages/compose.html Sat Sep 27 14:57:08 2008
@@ -21,7 +21,7 @@
<script type="text/javascript"
src="/site_media/jquery.autocomplete.js"></script>
<script type="text/javascript">
$().ready(function() {
-
$("#id_recipient").autocomplete("/account/username_autocomplete/", {
+ $("#id_recipient").autocomplete("{% url
profile_username_autocomplete %}", {
formatItem: function(data, i, n, value) {
values = value.split(",,");
return values[0] + values[1] + "<br />" + values[2];
Modified: trunk/pinax/templates/projects/project.html
==============================================================================
--- trunk/pinax/templates/projects/project.html (original)
+++ trunk/pinax/templates/projects/project.html Sat Sep 27 14:57:08 2008
@@ -167,7 +167,7 @@
<script type="text/javascript"
src="/site_media/jquery.autocomplete.js"></script>
<script type="text/javascript">
$().ready(function() {
-
$("#id_recipient").autocomplete("/account/username_autocomplete/", {
+ $("#id_recipient").autocomplete("{% url
profile_username_autocomplete %}", {
formatItem: function(data, i, n, value) {
values = value.split(",,");
return values[0] + values[1] + "<br />" + values[2];
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
