Mercurial > kallithea
changeset 1806:3480002d421e beta
merge with bb fork
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 21 Dec 2011 20:22:32 +0200 |
| parents | e84b3d98c07b (current diff) eb4b755fc6a2 (diff) |
| children | 1635a21485d6 |
| files | |
| diffstat | 4 files changed, 41 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/init.d/rhodecode-upstart.conf Wed Dec 21 20:22:32 2011 +0200 @@ -0,0 +1,26 @@ +# 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
--- a/rhodecode/controllers/login.py Wed Dec 21 20:16:50 2011 +0200 +++ b/rhodecode/controllers/login.py Wed Dec 21 20:22:32 2011 +0200 @@ -70,6 +70,11 @@ 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 ' @@ -159,7 +164,6 @@ 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'))
--- a/rhodecode/model/forms.py Wed Dec 21 20:16:50 2011 +0200 +++ b/rhodecode/model/forms.py Wed Dec 21 20:22:32 2011 +0200 @@ -482,6 +482,8 @@ 'tooShort':_('Enter %(min)i characters or more')} ) + remember = StringBoolean(if_missing=False) + chained_validators = [ValidAuth] def UserForm(edit=False, old_data={}):
--- a/rhodecode/templates/login.html Wed Dec 21 20:16:50 2011 +0200 +++ b/rhodecode/templates/login.html Wed Dec 21 20:22:32 2011 +0200 @@ -44,12 +44,12 @@ </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>