kallithea Changeset - 98abf8953b87

Changeset - 98abf8953b87

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 15 years ago 2010-07-24 02:18:48
marcin@python-works.com

Added user registration, changed login url schema, moved it into _admin/ for safety

4 files changed with 52 insertions and 11 deletions:

pylons_app/config/routing.py

pylons_app/controllers/login.py

pylons_app/model/forms.py

pylons_app/model/user_model.py

0 comments (0 inline, 0 general)

pylons_app/config/routing.py

➞

Show inline comments

@@ @@ -74,23 +74,25 @@ def make_map(config): @@
     #ADMIN
     with map.submapper(path_prefix='/_admin', controller='admin/admin') as m:
         m.connect('admin_home', '', action='index')#main page
         m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',
                   action='add_repo')
     #LOGIN/LOGOUT
     map.connect('login_home', '/_admin/login', controller='login')
     map.connect('logout_home', '/_admin/logout', controller='login', action='logout')
     map.connect('register', '/_admin/register', controller='login', action='register')
     #FEEDS
     map.connect('rss_feed_home', '/{repo_name:.*}/feed/rss',
                 controller='feed', action='rss',
                 conditions=dict(function=check_repo))
     map.connect('atom_feed_home', '/{repo_name:.*}/feed/atom',
                 controller='feed', action='atom',
                 conditions=dict(function=check_repo))
     #LOGIN/LOGOUT
     map.connect('login_home', '/login', controller='login')
     map.connect('logout_home', '/logout', controller='login', action='logout')
     #OTHERS
     map.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',
                 controller='changeset', revision='tip',
                 conditions=dict(function=check_repo))
     map.connect('summary_home', '/{repo_name:.*}/summary',

pylons_app/controllers/login.py

➞

Show inline comments

@@ @@ -14,25 +14,26 @@ @@
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 from formencode import htmlfill
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons_app.lib.auth import AuthUser
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.forms import LoginForm, RegisterForm
 from pylons_app.model.user_model import UserModel
 import formencode
 import logging
 """
 Created on April 22, 2010
 login controller for pylons
 @author: marcink
 """
 import logging
 from formencode import htmlfill
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons_app.lib.base import BaseController, render
 import formencode
 from pylons_app.model.forms import LoginForm
 from pylons_app.lib.auth import AuthUser
 log = logging.getLogger(__name__)
 class LoginController(BaseController):
     def __before__(self):
@@ @@ -57,11 +58,31 @@ class LoginController(BaseController): @@
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8")
         return render('/login.html')
     def register(self):
         if request.POST:
             user_model = UserModel()
             register_form = RegisterForm()()
             try:
                 form_result = register_form.to_python(dict(request.POST))
                 user_model.create_registration(form_result)
                 return redirect(url('login_home'))
             except formencode.Invalid as errors:
                 return htmlfill.render(
                     render('/register.html'),
                     defaults=errors.value,
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8")
         return render('/register.html')
     def logout(self):
         session['hg_app_user'] = AuthUser()
         session.save()
         log.info('Logging out and setting user as Empty')
         redirect(url('hg_home'))

pylons_app/model/forms.py

➞

Show inline comments

@@ @@ -262,12 +262,15 @@ def UserForm(edit=False, old_data={}): @@
         name = UnicodeString(strip=True, min=3, not_empty=True)
         lastname = UnicodeString(strip=True, min=3, not_empty=True)
         email = Email(not_empty=True)
     return _UserForm
 RegisterForm = UserForm
 def RepoForm(edit=False, old_data={}):
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
         description = UnicodeString(strip=True, min=3, not_empty=True)

pylons_app/model/user_model.py

➞

Show inline comments

@@ @@ -50,12 +50,27 @@ class UserModel(object): @@
             self.sa.commit()
         except Exception as e:
             log.error(e)
             self.sa.rollback()
             raise
     def create_registration(self, form_data):
         try:
             new_user = User()
             for k, v in form_data.items():
                 if k != 'admin' or k != 'active':
                     setattr(new_user, k, v)
                 setattr(new_user, 'active', True)
             self.sa.add(new_user)
             self.sa.commit()
         except Exception as e:
             log.error(e)
             self.sa.rollback()
             raise
     def update(self, id, form_data):
         try:
             new_user = self.sa.query(User).get(id)
             if new_user.username == 'default':
                 raise DefaultUserException(
                                 _("You can't Edit this user since it's"

0 comments (0 inline, 0 general)