From: Jordan Augé Date: Fri, 2 Aug 2013 08:07:56 +0000 (+0200) Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan X-Git-Tag: myslice-0.2-1~83^2~6 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=302dd5bda1297ed6579ca26da35ee67f8d35d934;hp=3a4e8104cf076bbbfb5219424f08629a295c4ccd;p=unfold.git Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan --- diff --git a/portal/models.py b/portal/models.py index 0dcbc6d4..029e3b55 100644 --- a/portal/models.py +++ b/portal/models.py @@ -223,7 +223,7 @@ class PendingUser(models.Model): verbose_name_plural = _('registration profiles') def __unicode__(self): - return u"Registration information for %s" % self.user + return u"Registration information for %s" % self.email def activation_key_expired(self): """ diff --git a/portal/templates/my_account.html b/portal/templates/my_account.html new file mode 100644 index 00000000..35dfa102 --- /dev/null +++ b/portal/templates/my_account.html @@ -0,0 +1,146 @@ +{% extends "layout-unfold1.html" %} + +{% block head %} + + + + + +{% endblock %} + +{% block unfold1_main %} + + + +
+
+

MySlice Account

+
+
+
+
+
+ {% csrf_token %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
Personal Details
+
Email + {{ person.email }} + +
Password + + ******** + + + + + + + + + + + + +
Enter password: + +
Confirm password: + + +
+ +
Full Name + Yasin Rahman + + + +
+ + + + + +
Affiliation + UPMC + +
Generate Keys + + + +
Public Key + + + ******** + + +
+
+ + + + + +
+ +
+ + +
Private Key ******** + + +
+ +

For better + security we recommend that you + download and delete your + private key from the + server. Always store your + private key in a secure + location.

+
+
+
+
+ +
+
+ +{% endblock %} diff --git a/portal/urls.py b/portal/urls.py index 64333b67..b756c98f 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -42,6 +42,9 @@ urlpatterns = patterns('', # User validation url(r'^user/validate/?$', UserValidateView.as_view(), name='user_validate'), url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'), + #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'), + url(r'^account/?$', views.my_account), + url(r'^acc_process/?$', views.acc_process), url(r'^contact/?$', views.contact), # Slice request url(r'^slice_request/?$', views.slice_request), diff --git a/portal/views.py b/portal/views.py index 3254e9b7..73e1ea4c 100644 --- a/portal/views.py +++ b/portal/views.py @@ -35,7 +35,7 @@ from portal.models import PendingUser, PendingSlice from manifold.core.query import Query from unfold.page import Page from myslice.viewutils import topmenu_items, the_user -from django.http import HttpResponseRedirect +from django.http import HttpResponseRedirect, HttpResponse class DashboardView(TemplateView): template_name = "dashboard.html" @@ -118,7 +118,7 @@ class UserRegisterView(RegistrationView): setting ``REGISTRATION_OPEN`` and setting it to ``False``. Omitting this setting, or setting it to ``True``, will be interpreted as meaning that registration is currently open and - permitted. + permitt ed. Internally, this is accomplished via storing an activation key in an instance of ``registration.models.RegistrationProfile``. See @@ -431,6 +431,83 @@ class UserValidateView(ActivationView): # DEPRECATED # return p.render() +# DEPRECATED ## view for my_account +# DEPRECATED # class MyAccountView(TemplateView): +# DEPRECATED # template_name = "my_account.html" +# DEPRECATED # +# DEPRECATED # def from_process(self, request, **cleaned_data): +# DEPRECATED # #if request.method == 'POST': +# DEPRECATED # # if request.POST['submit_name']: +# DEPRECATED # if 'fname' in request.POST: +# DEPRECATED # messsag= "Got Name" +# DEPRECATED # #return render(request, 'portal/my_account.html') +# DEPRECATED # #response = HttpResponse("Here's the text of the Web page.") +# DEPRECATED # return HttpResponse(message) +# DEPRECATED # +# DEPRECATED # def get_context_data(self, **kwargs): +# DEPRECATED # page = Page(self.request) +# DEPRECATED # context = super(MyAccountView, self).get_context_data(**kwargs) +# DEPRECATED # context['person'] = self.request.user +# DEPRECATED # # XXX This is repeated in all pages +# DEPRECATED # # more general variables expected in the template +# DEPRECATED # context['title'] = 'User Profile Page' +# DEPRECATED # # the menu items on the top +# DEPRECATED # context['topmenu_items'] = topmenu_items('my_account', self.request) +# DEPRECATED # # so we can sho who is logged +# DEPRECATED # context['username'] = the_user(self.request) +# DEPRECATED # context.update(page.prelude_env()) +# DEPRECATED # return context + + + +# View for my_account form +def my_account(request): + return render(request, 'my_account.html') + +#my_acc form value processing +def acc_process(request): + if 'submit_name' in request.POST: + edited_first_name = request.POST['fname'] + edited_last_name = request.POST['lname'] + #email = 'test_email@gmail.com' + #password = 'test_pp' + #message = 'F_Name: %s L_name: %s dummy_pp: %s' % (first_name, last_name, password) + #site = None + + # insert into DB [needed for registration page] + #approach borrowed from register view + #new_user = PendingUser.objects.create_inactive_user(edited_first_name, edited_last_name, email, password, site) + #conventional approach + #b = PendingUser(first_name=edited_first_name, edited_last_name=last_name) + #b.save() + + # select and update [will be used throughout this view] + # select the logged in user [for the moment hard coded] + get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email + # update first and last name + get_user.first_name = edited_first_name + get_user.last_name = edited_last_name + get_user.save() + + return HttpResponse('Success: Name Updated!!') + elif 'submit_pass' in request.POST: + edited_password = request.POST['password'] + # select the logged in user [for the moment hard coded] + get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email + # update password + get_user.password = edited_password + get_user.save() + return HttpResponse('Success: Password Changed!!') + elif 'generate' in request.POST: + a =2 + message = 'Here will generate ssh-rsa keys :D %d' %a + return HttpResponse(message) + else: + message = 'You submitted an empty form.' + return HttpResponse(message) + + + # view for contact form def contact(request): if request.method == 'POST': # If the form has been submitted...