kallithea Changeset - 3480002d421e

Changeset - 3480002d421e

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 3 1

Marcin Kuzminski - 14 years ago 2011-12-21 19:22:32
marcin@python-works.com

merge with bb fork

4 files changed with 41 insertions and 9 deletions:

init.d/rhodecode-upstart.conf

rhodecode/controllers/login.py

rhodecode/model/forms.py

rhodecode/templates/login.html

0 comments (0 inline, 0 general)

init.d/rhodecode-upstart.conf

➞

Show inline comments

@@ new file 100644 @@
 # rhodecode - run the rhodecode daemon as an upstart job
 # Change variables/paths as necessary and place file /etc/init/rhodecode.conf
 # start/stop/restart as normal upstart job (ie: $ start rhodecode)
 description	"RhodeCode Mercurial Server"
 author		"Matt Zuba <matt.zuba@goodwillaz.org"
 start on (local-filesystems and runlevel [2345])
 stop on runlevel [!2345]
 respawn
 umask 0022
 env PIDFILE=/var/hg/rhodecode/rhodecode.pid
 env LOGFILE=/var/hg/rhodecode/log/rhodecode.log
 env APPINI=/var/hg/rhodecode/production.ini
 env HOME=/var/hg
 env USER=hg
 env GROUP=hg
 exec /var/hg/.virtualenvs/rhodecode/bin/paster serve --user=$USER --group=$GROUP --pid-file=$PIDFILE --log-file=$LOGFILE $APPINI
 post-stop script
 	rm $PIDFILE
 end script

rhodecode/controllers/login.py

➞

Show inline comments

@@ @@ -67,12 +67,17 @@ class LoginController(BaseController): @@
                 username = c.form_result['username']
                 user = User.get_by_username(username, case_insensitive=True)
                 auth_user = AuthUser(user.user_id)
                 auth_user.set_authenticated()
                 cs = auth_user.get_cookie_store()
                 session['rhodecode_user'] = cs
                 # If they want to be remembered, update the cookie
                 if c.form_result['remember'] is not False:
                     session.cookie_expires = False
                     session._set_cookie_values()
                 session._update_cookie_out()
                 session.save()
                 log.info('user %s is now authenticated and stored in '
                          'session, session attrs %s' % (username, cs))
                 user.update_lastlogin()
                 Session.commit()
@@ @@ -156,10 +161,9 @@ class LoginController(BaseController): @@
                 log.error(e)
                 return redirect(url('reset_password'))
         return redirect(url('login_home'))
     def logout(self):
         del session['rhodecode_user']
         session.save()
         log.info('Logging out and setting user as Empty')
         session.delete()
         log.info('Logging out and deleting session for user')
         redirect(url('home'))

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -479,12 +479,14 @@ class LoginForm(formencode.Schema): @@
                             not_empty=True,
                             messages={
                                 'empty':_('Please enter a password'),
                                 'tooShort':_('Enter %(min)i characters or more')}
+                                )
     remember = StringBoolean(if_missing=False)
     chained_validators = [ValidAuth]
 def UserForm(edit=False, old_data={}):
     class _UserForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = True

rhodecode/templates/login.html

➞

Show inline comments

@@ @@ -41,18 +41,18 @@ @@
                     </div>
                     <div class="input">
                         ${h.password('password',class_='focus',size=40)}
                     </div>
                 </div>
                 ##<div class="field">
                 ##    <div class="checkbox">
                 ##        <input type="checkbox" id="remember" name="remember" />
                 ##        <label for="remember">Remember me</label>
                 ##    </div>
                 ##</div>
                 <div class="field">
                     <div class="checkbox">
                         <input type="checkbox" id="remember" name="remember" />
                         <label for="remember">${_('Remember me')}</label>
                     </div>
                 </div>
                 <div class="buttons">
                     ${h.submit('sign_in',_('Sign In'),class_="ui-button")}
                 </div>
             </div>
             <!-- end fields -->
             <!-- links -->

0 comments (0 inline, 0 general)