27 from django import shortcuts |
27 from django import shortcuts |
28 from django import newforms as forms |
28 from django import newforms as forms |
29 from django.utils.translation import ugettext_lazy |
29 from django.utils.translation import ugettext_lazy |
30 |
30 |
31 import soc.logic |
31 import soc.logic |
|
32 from soc.logic import models |
32 from soc.logic import validate |
33 from soc.logic import validate |
33 from soc.logic import out_of_band |
34 from soc.logic import out_of_band |
34 from soc.logic.site import id_user |
35 from soc.logic.site import id_user |
35 from soc.views import helper |
36 from soc.views import helper |
36 import soc.views.helper.forms |
37 import soc.views.helper.forms |
135 link_name : new_link_name, |
136 link_name : new_link_name, |
136 nick_name : form.cleaned_data.get("nick_name"), |
137 nick_name : form.cleaned_data.get("nick_name"), |
137 id : id, |
138 id : id, |
138 } |
139 } |
139 |
140 |
140 user = soc.logic.user_logic.updateOrCreateFromFields(properties, email=id) |
141 user = models.user.logic.updateOrCreateFromFields(properties, email=id.email()) |
141 |
142 |
142 # redirect to new /user/profile/new_link_name?s=0 |
143 # redirect to new /user/profile/new_link_name?s=0 |
143 # (causes 'Profile saved' message to be displayed) |
144 # (causes 'Profile saved' message to be displayed) |
144 return helper.responses.redirectToChangedSuffix( |
145 return helper.responses.redirectToChangedSuffix( |
145 request, link_name, new_link_name, params=SUBMIT_PROFILE_SAVED_PARAMS) |
146 request, link_name, new_link_name, params=SUBMIT_PROFILE_SAVED_PARAMS) |
146 else: # request.method == 'GET' |
147 else: # request.method == 'GET' |
147 # try to fetch User entity corresponding to Google Account if one exists |
148 # try to fetch User entity corresponding to Google Account if one exists |
148 user = soc.logic.user_logic.getFromFields(email=id) |
149 user = models.user.logic.getFromFields(email=id) |
149 |
150 |
150 if user: |
151 if user: |
151 # is 'Profile saved' parameter present, but referrer was not ourself? |
152 # is 'Profile saved' parameter present, but referrer was not ourself? |
152 # (e.g. someone bookmarked the GET that followed the POST submit) |
153 # (e.g. someone bookmarked the GET that followed the POST submit) |
153 if (request.GET.get(SUBMIT_MSG_PARAM_NAME) |
154 if (request.GET.get(SUBMIT_MSG_PARAM_NAME) |