summaryrefslogtreecommitdiffstats
path: root/hyperkitty/views
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2012-08-30 18:23:45 +0200
committerAurélien Bompard <aurelien@bompard.org>2012-08-30 18:23:45 +0200
commit0637b6b97fec94799c3733e8b20519456814fce8 (patch)
tree026d15d66afec93ab5046bea50faab6c5b5d90b1 /hyperkitty/views
parentec7da1aac20a01838d30e02d550c13b22414be73 (diff)
downloadhyperkitty-0637b6b97fec94799c3733e8b20519456814fce8.tar.gz
hyperkitty-0637b6b97fec94799c3733e8b20519456814fce8.tar.xz
hyperkitty-0637b6b97fec94799c3733e8b20519456814fce8.zip
Normalize tabs to spaces
Diffstat (limited to 'hyperkitty/views')
-rw-r--r--hyperkitty/views/accounts.py46
-rw-r--r--hyperkitty/views/forms.py8
-rw-r--r--hyperkitty/views/list.py20
-rw-r--r--hyperkitty/views/message.py28
-rw-r--r--hyperkitty/views/thread.py56
5 files changed, 79 insertions, 79 deletions
diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py
index 4f3d96b..b81583f 100644
--- a/hyperkitty/views/accounts.py
+++ b/hyperkitty/views/accounts.py
@@ -47,8 +47,8 @@ def user_logout(request):
return redirect('user_login')
def user_login(request, template='login.html'):
-
- parse_r = urlparse(request.META.get('HTTP_REFERER', 'index'))
+
+ parse_r = urlparse(request.META.get('HTTP_REFERER', 'index'))
previous = '%s%s' % (parse_r.path, parse_r.query)
next_var = request.POST.get('next', request.GET.get('next', previous))
@@ -57,12 +57,12 @@ def user_login(request, template='login.html'):
form = AuthenticationForm(request.POST)
user = authenticate(username=request.POST.get('username'),
password=request.POST.get('password'))
-
- if user is not None:
- log('debug', user)
- if user.is_active:
- login(request, user)
- return redirect(next_var)
+
+ if user is not None:
+ log('debug', user)
+ if user.is_active:
+ login(request, user)
+ return redirect(next_var)
else:
form = AuthenticationForm()
@@ -73,20 +73,20 @@ def user_login(request, template='login.html'):
def user_profile(request, user_email=None):
if not request.user.is_authenticated():
return redirect('user_login')
-
+
# try to render the user profile.
try:
- user_profile = request.user.get_profile()
- # @TODO: Include the error name e.g, ProfileDoesNotExist?
+ user_profile = request.user.get_profile()
+ # @TODO: Include the error name e.g, ProfileDoesNotExist?
except:
- user_profile = UserProfile.objects.create(user=request.user)
+ user_profile = UserProfile.objects.create(user=request.user)
t = loader.get_template('user_profile.html')
c = RequestContext(request, {
'user_profile' : user_profile,
})
-
+
return HttpResponse(t.render(c))
@@ -94,22 +94,22 @@ def user_registration(request):
if request.user.is_authenticated():
# Already registered, redirect back to index page
return redirect('index')
-
+
if request.POST:
form = RegistrationForm(request.POST)
if form.is_valid():
- # Save the user data.
- form.save(form.cleaned_data)
- user = authenticate(username=form.cleaned_data['username'],
- password=form.cleaned_data['password1'])
+ # Save the user data.
+ form.save(form.cleaned_data)
+ user = authenticate(username=form.cleaned_data['username'],
+ password=form.cleaned_data['password1'])
if user is not None:
- log('debug', user)
- if user.is_active:
- login(request, user)
- return redirect('index')
+ log('debug', user)
+ if user.is_active:
+ login(request, user)
+ return redirect('index')
else:
form = RegistrationForm()
-
+
return render_to_response('register.html', {'form': form}, context_instance=RequestContext(request))
diff --git a/hyperkitty/views/forms.py b/hyperkitty/views/forms.py
index 97e5550..fc885c8 100644
--- a/hyperkitty/views/forms.py
+++ b/hyperkitty/views/forms.py
@@ -8,7 +8,7 @@ def isValidUsername(username):
except User.DoesNotExist:
return
raise validators.ValidationError('The username "%s" is already taken.' % username)
-
+
class RegistrationForm(forms.Form):
username = forms.CharField(label='username', help_text=None,
@@ -18,11 +18,11 @@ class RegistrationForm(forms.Form):
)
email = forms.EmailField(required=True)
-
+
password1 = forms.CharField(widget=forms.PasswordInput)
-
+
password2 = forms.CharField(widget=forms.PasswordInput)
-
+
def save(self, new_user_data):
u = User.objects.create_user(new_user_data['username'],
new_user_data['email'],
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index d122c84..e4a69bd 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -34,7 +34,7 @@ def archives(request, mlist_fqdn, year=None, month=None, day=None):
# No year/month: past 32 days
# year and month: find the 32 days for that month
# @TODO : modify url.py to account for page number
-
+
end_date = None
if year or month or day:
try:
@@ -89,7 +89,7 @@ def archives(request, mlist_fqdn, year=None, month=None, day=None):
totallikes = 0
totaldislikes = 0
messages = STORE.get_thread(mlist_fqdn, thread.thread_id)
-
+
for message in messages:
# Extract all the votes for this message
try:
@@ -107,27 +107,27 @@ def archives(request, mlist_fqdn, year=None, month=None, day=None):
dislikes = dislikes + 1
else:
pass
-
+
totallikes = totallikes + likes
totalvotes = totalvotes + likes + dislikes
totaldislikes = totaldislikes + dislikes
-
+
try:
thread.avglike = totallikes / totalvotes
except:
thread.avglike = 0
-
- try:
+
+ try:
thread.avgdislike = totaldislikes / totalvotes
except:
thread.avgdislike = 0
-
+
threads[cnt] = thread
- cnt = cnt + 1
+ cnt = cnt + 1
paginator = Paginator(threads, 10)
pageNo = request.GET.get('page')
-
+
try:
threads = paginator.page(pageNo)
except PageNotAnInteger:
@@ -139,7 +139,7 @@ def archives(request, mlist_fqdn, year=None, month=None, day=None):
archives_length = STORE.get_archives_length(mlist_fqdn)
-
+
c = RequestContext(request, {
'list_name' : list_name,
'objects': threads.object_list,
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 9f0191a..84997fd 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -28,21 +28,21 @@ def index (request, mlist_fqdn, hashid):
message.sender_email = message.sender_email.strip()
# Extract all the votes for this message
try:
- votes = Rating.objects.filter(messageid = hashid)
+ votes = Rating.objects.filter(messageid = hashid)
except Rating.DoesNotExist:
- votes = {}
+ votes = {}
likes = 0
dislikes = 0
for vote in votes:
- if vote.vote == 1:
- likes = likes + 1
- elif vote.vote == -1:
- dislikes = dislikes + 1
- else:
- pass
-
+ if vote.vote == 1:
+ likes = likes + 1
+ elif vote.vote == -1:
+ dislikes = dislikes + 1
+ else:
+ pass
+
message.votes = votes
message.likes = likes
message.dislikes = dislikes
@@ -51,7 +51,7 @@ def index (request, mlist_fqdn, hashid):
'list_name' : list_name,
'list_address': mlist_fqdn,
'message': message,
- 'hashid' : hashid,
+ 'hashid' : hashid,
})
return HttpResponse(t.render(c))
@@ -61,19 +61,19 @@ def index (request, mlist_fqdn, hashid):
def vote (request, mlist_fqdn):
""" Add a rating to a given message identified by messageid. """
if not request.user.is_authenticated():
- return redirect('user_login')
+ return redirect('user_login')
value = request.POST['vote']
hashid = request.POST['hashid']
# Checks if the user has already voted for a this message. If yes modify db entry else create a new one.
try:
- v = Rating.objects.get(user = request.user, messageid = hashid, list_address = mlist_fqdn)
+ v = Rating.objects.get(user = request.user, messageid = hashid, list_address = mlist_fqdn)
except Rating.DoesNotExist:
- v = Rating(list_address=mlist_fqdn, messageid = hashid, vote = value)
+ v = Rating(list_address=mlist_fqdn, messageid = hashid, vote = value)
v.user = request.user
- v.vote = value
+ v.vote = value
v.save()
response_dict = { }
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index 355dd39..7d78885 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -37,29 +37,29 @@ def thread_index (request, mlist_fqdn, threadid):
cnt = 0
for message in threads:
- # @TODO: Move this logic inside KittyStore?
- message.sender_email = message.sender_email.strip()
-
- # Extract all the votes for this message
- try:
- votes = Rating.objects.filter(messageid=message.message_id)
- except Rating.DoesNotExist:
- votes = {}
-
- likes = 0
- dislikes = 0
-
- for vote in votes:
- if vote.vote == 1:
- likes = likes + 1
- elif vote.vote == -1:
- dislikes = dislikes + 1
- else:
- pass
-
- message.votes = votes
- message.likes = likes
- message.dislikes = dislikes
+ # @TODO: Move this logic inside KittyStore?
+ message.sender_email = message.sender_email.strip()
+
+ # Extract all the votes for this message
+ try:
+ votes = Rating.objects.filter(messageid=message.message_id)
+ except Rating.DoesNotExist:
+ votes = {}
+
+ likes = 0
+ dislikes = 0
+
+ for vote in votes:
+ if vote.vote == 1:
+ likes = likes + 1
+ elif vote.vote == -1:
+ dislikes = dislikes + 1
+ else:
+ pass
+
+ message.votes = votes
+ message.likes = likes
+ message.dislikes = dislikes
# Statistics on how many participants and threads this month
participants[message.sender_name] = {'email': message.sender_email}
@@ -68,7 +68,7 @@ def thread_index (request, mlist_fqdn, threadid):
archives_length = STORE.get_archives_length(mlist_fqdn)
from_url = '/thread/%s/%s/' % (mlist_fqdn, threadid)
tag_form = AddTagForm(initial={'from_url' : from_url})
-
+
try:
tags = Tag.objects.filter(threadid=threadid)
except Tag.DoesNotExist:
@@ -103,18 +103,18 @@ def add_tag(request, mlist_fqdn, email_id):
form = AddTagForm(request.POST)
if form.is_valid():
print "Adding tag..."
-
+
tag = form.data['tag']
-
+
try:
tag_obj = Tag.objects.get(threadid=email_id, list_address=mlist_fqdn, tag=tag)
except Tag.DoesNotExist:
tag_obj = Tag(list_address=mlist_fqdn, threadid=email_id, tag=tag)
-
+
tag_obj.save()
response_dict = { }
else:
response_dict = {'error' : 'Error adding tag, enter valid data' }
-
+
return HttpResponse(simplejson.dumps(response_dict), mimetype='application/javascript')