equal
deleted
inserted
replaced
30 from soc.logic import dicts |
30 from soc.logic import dicts |
31 from soc.logic import validate |
31 from soc.logic import validate |
32 from soc.logic.models import user as user_logic |
32 from soc.logic.models import user as user_logic |
33 from soc.views import helper |
33 from soc.views import helper |
34 from soc.views.models import base |
34 from soc.views.models import base |
35 from soc.views.sitemap import sidebar |
|
36 |
35 |
37 import soc.models.user |
36 import soc.models.user |
38 import soc.logic.models.user |
37 import soc.logic.models.user |
39 import soc.views.helper |
38 import soc.views.helper |
40 |
39 |
91 old_email = None |
90 old_email = None |
92 |
91 |
93 new_email = form_account.email() |
92 new_email = form_account.email() |
94 |
93 |
95 if new_email != old_email \ |
94 if new_email != old_email \ |
96 and user_logic.logic.getFromFields(email=new_email): |
95 and user_logic.logic.getForFields({'email': new_email}, unique=True): |
97 raise forms.ValidationError("This account is already in use.") |
96 raise forms.ValidationError("This account is already in use.") |
98 |
97 |
99 return self.cleaned_data.get('email') |
98 return self.cleaned_data.get('email') |
100 |
99 |
101 |
100 |
203 ('/user/edit', 'Profile'), |
202 ('/user/edit', 'Profile'), |
204 ('/roles/list', 'Roles'), |
203 ('/roles/list', 'Roles'), |
205 ] |
204 ] |
206 return self.getSidebarLinks(params) |
205 return self.getSidebarLinks(params) |
207 |
206 |
|
207 def getDjangoURLPatterns(self): |
|
208 """see base.View.getDjangoURLPatterns() |
|
209 """ |
|
210 |
|
211 patterns = super(View, self).getDjangoURLPatterns() |
|
212 patterns += [(r'^user/edit$','soc.views.user.profile.create')] |
|
213 return patterns |
|
214 |
208 |
215 |
209 view = View() |
216 view = View() |
210 |
217 |
211 create = view.create |
218 create = view.create |
212 delete = view.delete |
219 delete = view.delete |
213 edit = view.edit |
220 edit = view.edit |
214 list = view.list |
221 list = view.list |
215 public = view.public |
222 public = view.public |
216 edit_self = view.editSelf |
223 edit_self = view.editSelf |
217 |
|
218 sidebar.SIDEBAR.append(view.getSidebarLinks()) |
|