mirror of
https://github.com/nikdoof/test-auth.git
synced 2025-12-14 14:52:15 +00:00
Added message notifications
This commit is contained in:
@@ -74,6 +74,22 @@ body
|
|||||||
height: 1%;
|
height: 1%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#content #messagelist
|
||||||
|
{
|
||||||
|
width: 760px;
|
||||||
|
border: 1px solid #efefef;
|
||||||
|
background: #ffc;
|
||||||
|
list-style-type: none;
|
||||||
|
margin: 0px;
|
||||||
|
padding: 0px 0px 5px;
|
||||||
|
}
|
||||||
|
#content #messagelist li
|
||||||
|
{
|
||||||
|
margin: 0px;
|
||||||
|
padding-left: 5px;
|
||||||
|
padding-top: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
table
|
table
|
||||||
{text-align: center;
|
{text-align: center;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|||||||
16
sso/views.py
16
sso/views.py
@@ -6,6 +6,7 @@ from django.shortcuts import render_to_response
|
|||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.contrib.auth.decorators import login_required
|
from django.contrib.auth.decorators import login_required
|
||||||
|
from django.template import RequestContext
|
||||||
|
|
||||||
from eve_api.api_exceptions import APIAuthException, APINoUserIDException
|
from eve_api.api_exceptions import APIAuthException, APINoUserIDException
|
||||||
from eve_api.api_puller.accounts import import_eve_account
|
from eve_api.api_puller.accounts import import_eve_account
|
||||||
@@ -46,7 +47,7 @@ def profile(request):
|
|||||||
except EVEAccount.DoesNotExist:
|
except EVEAccount.DoesNotExist:
|
||||||
eveaccounts = None
|
eveaccounts = None
|
||||||
|
|
||||||
return render_to_response('sso/profile.html', locals())
|
return render_to_response('sso/profile.html', locals(), context_instance=RequestContext(request))
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def eveapi_add(request):
|
def eveapi_add(request):
|
||||||
@@ -61,6 +62,7 @@ def eveapi_add(request):
|
|||||||
acc.user = request.user
|
acc.user = request.user
|
||||||
acc.description = form.cleaned_data['description']
|
acc.description = form.cleaned_data['description']
|
||||||
acc.save()
|
acc.save()
|
||||||
|
request.user.message_set.create(message="EVE API successfully added.")
|
||||||
|
|
||||||
request.user.get_profile().update_access()
|
request.user.get_profile().update_access()
|
||||||
|
|
||||||
@@ -68,7 +70,7 @@ def eveapi_add(request):
|
|||||||
else:
|
else:
|
||||||
form = EveAPIForm() # An unbound form
|
form = EveAPIForm() # An unbound form
|
||||||
|
|
||||||
return render_to_response('sso/eveapi.html', locals())
|
return render_to_response('sso/eveapi.html', locals(), context_instance=RequestContext(request))
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def eveapi_del(request, userid=0):
|
def eveapi_del(request, userid=0):
|
||||||
@@ -82,6 +84,7 @@ def eveapi_del(request, userid=0):
|
|||||||
|
|
||||||
if acc.user == request.user:
|
if acc.user == request.user:
|
||||||
acc.delete()
|
acc.delete()
|
||||||
|
request.user.message_set.create(message="EVE API key successfully deleted.")
|
||||||
|
|
||||||
return HttpResponseRedirect(reverse('sso.views.profile'))
|
return HttpResponseRedirect(reverse('sso.views.profile'))
|
||||||
|
|
||||||
@@ -114,7 +117,7 @@ def service_add(request):
|
|||||||
|
|
||||||
availserv = Service.objects.filter(groups__in=request.user.groups.all()).exclude(id__in=ServiceAccount.objects.filter(user=request.user).values('service'))
|
availserv = Service.objects.filter(groups__in=request.user.groups.all()).exclude(id__in=ServiceAccount.objects.filter(user=request.user).values('service'))
|
||||||
if len(availserv) == 0:
|
if len(availserv) == 0:
|
||||||
return render_to_response('sso/serviceaccount/noneavailable.html', locals())
|
return render_to_response('sso/serviceaccount/noneavailable.html', locals(), context_instance=RequestContext(request))
|
||||||
else:
|
else:
|
||||||
form = clsform() # An unbound form
|
form = clsform() # An unbound form
|
||||||
|
|
||||||
@@ -131,7 +134,7 @@ def service_del(request, serviceid=0):
|
|||||||
|
|
||||||
if acc.user == request.user:
|
if acc.user == request.user:
|
||||||
acc.delete()
|
acc.delete()
|
||||||
|
request.user.message_set.create(message="Service account successfully deleted.")
|
||||||
return HttpResponseRedirect(reverse('sso.views.profile'))
|
return HttpResponseRedirect(reverse('sso.views.profile'))
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@@ -150,7 +153,7 @@ def service_reset(request, serviceid=0, accept=0):
|
|||||||
|
|
||||||
api = acc.service.api_class
|
api = acc.service.api_class
|
||||||
api.enable_user(acc.service_uid, passwd)
|
api.enable_user(acc.service_uid, passwd)
|
||||||
return render_to_response('sso/serviceaccount/resetcomplete.html', locals())
|
return render_to_response('sso/serviceaccount/resetcomplete.html', locals(), context_instance=RequestContext(request))
|
||||||
|
|
||||||
return HttpResponseRedirect(reverse('sso.views.profile'))
|
return HttpResponseRedirect(reverse('sso.views.profile'))
|
||||||
|
|
||||||
@@ -169,6 +172,8 @@ def reddit_add(request):
|
|||||||
acc.api_update()
|
acc.api_update()
|
||||||
|
|
||||||
acc.save()
|
acc.save()
|
||||||
|
|
||||||
|
request.user.message_set.create(message="Reddit account %s successfully added." % acc.username)
|
||||||
return HttpResponseRedirect(reverse('sso.views.profile')) # Redirect after POST
|
return HttpResponseRedirect(reverse('sso.views.profile')) # Redirect after POST
|
||||||
else:
|
else:
|
||||||
defaults = { 'username': request.user.username, }
|
defaults = { 'username': request.user.username, }
|
||||||
@@ -186,6 +191,7 @@ def reddit_del(request, redditid=0):
|
|||||||
|
|
||||||
if acc.user == request.user:
|
if acc.user == request.user:
|
||||||
acc.delete()
|
acc.delete()
|
||||||
|
request.user.message_set.create(message="Reddit account successfully deleted.")
|
||||||
|
|
||||||
return HttpResponseRedirect(reverse('sso.views.profile'))
|
return HttpResponseRedirect(reverse('sso.views.profile'))
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,13 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div id="content">
|
<div id="content">
|
||||||
|
{% if messages %}
|
||||||
|
<ul id="messagelist">
|
||||||
|
{% for message in messages %}
|
||||||
|
<li>{{ message }}</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
{% endif %}
|
||||||
{% block content %}{% endblock %}
|
{% block content %}{% endblock %}
|
||||||
</div>
|
</div>
|
||||||
<div id="footer">
|
<div id="footer">
|
||||||
|
|||||||
Reference in New Issue
Block a user