equal
deleted
inserted
replaced
31 |
31 |
32 |
32 |
33 from google.appengine.api import users |
33 from google.appengine.api import users |
34 from django.utils.translation import ugettext_lazy |
34 from django.utils.translation import ugettext_lazy |
35 |
35 |
36 import soc.logic.host |
36 from soc.logic import models |
37 from soc.logic.site import id_user |
37 from soc.logic.site import id_user |
38 from soc.views.simple import requestLogin |
38 from soc.views.simple import requestLogin |
39 import soc.views.out_of_band |
39 import soc.views.out_of_band |
40 |
40 |
41 |
41 |
94 """ |
94 """ |
95 |
95 |
96 checkIsLoggedIn(request) |
96 checkIsLoggedIn(request) |
97 |
97 |
98 id = users.get_current_user() |
98 id = users.get_current_user() |
99 user = soc.logic.user_logic.getFromFields(email=id) |
99 user = models.user.logic.getFromFields(email=id) |
100 |
100 |
101 if user: |
101 if user: |
102 return |
102 return |
103 |
103 |
104 login_request = requestLogin(request, DEF_LOGIN_TMPL, |
104 login_request = requestLogin(request, DEF_LOGIN_TMPL, |