haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 08:16:07 +00:00
Code Issues Releases Wiki Activity

Update T&C

Browse Source 
Conflicts:
	seahub/templates/js/sysadmin-templates.html
	seahub/templates/sysadmin/base.html
	seahub/urls.py
	seahub/views/sysadmin.py
This commit is contained in:
zhengxie
2016-07-18 13:04:05 +08:00
parent 41f9a3950c
commit 0f73921205
15 changed files with 286 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
thirdpart/termsandconditions/views.py
View File

@@ -2,7 +2,7 @@
# pylint: disable=E1120,R0901,R0904
from django.contrib.auth.models import User
# from django.contrib.auth.models import User
from .forms import UserTermsAndConditionsModelForm, EmailTermsForm
from .models import TermsAndConditions, UserTermsAndConditions, DEFAULT_TERMS_SLUG
from django.conf import settings
@@ -68,13 +68,16 @@ class AcceptTermsView(CreateView):
def form_valid(self, form):
"""Override of CreateView method, assigns default values based on user situation"""
if self.request.user.is_authenticated():
form.instance.user = self.request.user
form.instance.username = self.request.user.username
else: #Get user out of saved pipeline from django-socialauth
# no support for social auth right now.
assert False, 'TODO'
if self.request.session.has_key('partial_pipeline'):
user_pk = self.request.session['partial_pipeline']['kwargs']['user']['pk']
form.instance.user = User.objects.get(id=user_pk)
else:
return HttpResponseRedirect('/')
store_ip_address = getattr(settings, 'TERMS_STORE_IP_ADDRESS', True)
if store_ip_address:
form.instance.ip_address = self.request.META['REMOTE_ADDR']