Mercurial > public > src > rhodecode
comparison pylons_app/controllers/users.py @ 234:a0116e944da1
changed naming convention for db modules.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 27 May 2010 21:31:30 +0200 |
parents | b68b2246e5a6 |
children | fcab58c43ea1 |
comparison
equal
deleted
inserted
replaced
233:08e0347351d0 | 234:a0116e944da1 |
---|---|
3 from pylons import request, response, session, tmpl_context as c, url, app_globals as g | 3 from pylons import request, response, session, tmpl_context as c, url, app_globals as g |
4 from pylons.controllers.util import abort, redirect | 4 from pylons.controllers.util import abort, redirect |
5 | 5 |
6 from pylons_app.lib.base import BaseController, render | 6 from pylons_app.lib.base import BaseController, render |
7 from formencode import htmlfill | 7 from formencode import htmlfill |
8 from pylons_app.model.db import Users, UserLogs | 8 from pylons_app.model.db import User, UserLog |
9 import crypt | 9 import crypt |
10 | 10 |
11 log = logging.getLogger(__name__) | 11 log = logging.getLogger(__name__) |
12 | 12 |
13 class UsersController(BaseController): | 13 class UsersController(BaseController): |
23 | 23 |
24 def index(self, format='html'): | 24 def index(self, format='html'): |
25 """GET /users: All items in the collection""" | 25 """GET /users: All items in the collection""" |
26 # url('users') | 26 # url('users') |
27 | 27 |
28 c.users_list = self.sa.query(Users).all() | 28 c.users_list = self.sa.query(User).all() |
29 return render('admin/users/users.html') | 29 return render('admin/users/users.html') |
30 | 30 |
31 def create(self): | 31 def create(self): |
32 """POST /users: Create a new item""" | 32 """POST /users: Create a new item""" |
33 # url('users') | 33 # url('users') |
34 params = dict(request.params) | 34 params = dict(request.params) |
35 | 35 |
36 try: | 36 try: |
37 new_user = Users() | 37 new_user = User() |
38 new_user.active = params.get('active', False) | 38 new_user.active = params.get('active', False) |
39 new_user.username = params.get('username') | 39 new_user.username = params.get('username') |
40 new_user.password = crypt.crypt(params.get('password'), '6a') | 40 new_user.password = crypt.crypt(params.get('password'), '6a') |
41 new_user.admin = False | 41 new_user.admin = False |
42 self.sa.add(new_user) | 42 self.sa.add(new_user) |
61 # method='put') | 61 # method='put') |
62 # url('user', id=ID) | 62 # url('user', id=ID) |
63 params = dict(request.params) | 63 params = dict(request.params) |
64 | 64 |
65 try: | 65 try: |
66 new_user = self.sa.query(Users).get(id) | 66 new_user = self.sa.query(User).get(id) |
67 new_user.active = params.get('active', False) | 67 new_user.active = params.get('active', False) |
68 new_user.username = params.get('username') | 68 new_user.username = params.get('username') |
69 if params.get('new_password'): | 69 if params.get('new_password'): |
70 new_user.password = crypt.crypt(params.get('new_password'), '6a') | 70 new_user.password = crypt.crypt(params.get('new_password'), '6a') |
71 self.sa.add(new_user) | 71 self.sa.add(new_user) |
83 # Or using helpers: | 83 # Or using helpers: |
84 # h.form(url('user', id=ID), | 84 # h.form(url('user', id=ID), |
85 # method='delete') | 85 # method='delete') |
86 # url('user', id=ID) | 86 # url('user', id=ID) |
87 try: | 87 try: |
88 self.sa.delete(self.sa.query(Users).get(id)) | 88 self.sa.delete(self.sa.query(User).get(id)) |
89 self.sa.commit() | 89 self.sa.commit() |
90 except: | 90 except: |
91 self.sa.rollback() | 91 self.sa.rollback() |
92 raise | 92 raise |
93 return redirect(url('users')) | 93 return redirect(url('users')) |
98 | 98 |
99 | 99 |
100 def edit(self, id, format='html'): | 100 def edit(self, id, format='html'): |
101 """GET /users/id/edit: Form to edit an existing item""" | 101 """GET /users/id/edit: Form to edit an existing item""" |
102 # url('edit_user', id=ID) | 102 # url('edit_user', id=ID) |
103 c.user = self.sa.query(Users).get(id) | 103 c.user = self.sa.query(User).get(id) |
104 defaults = c.user.__dict__ | 104 defaults = c.user.__dict__ |
105 return htmlfill.render( | 105 return htmlfill.render( |
106 render('admin/users/user_edit.html'), | 106 render('admin/users/user_edit.html'), |
107 defaults=defaults, | 107 defaults=defaults, |
108 encoding="UTF-8", | 108 encoding="UTF-8", |