Mercurial > hg > savane-forge
changeset 73:a77ad0d0eb63
Added default values to the ssh/gpg forms, so the user will see what did he set.
| author | Jonathan Gonzalez V <zeus@lunareja.(none)> |
|---|---|
| date | Wed, 24 Jun 2009 14:51:59 -0400 |
| parents | c8922fca816e |
| children | 1158876eb362 |
| files | savane/savane_user/views.py |
| diffstat | 1 files changed, 19 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/savane/savane_user/views.py +++ b/savane/savane_user/views.py @@ -94,11 +94,11 @@ error_msg = None success_msg = None + form_ssh = SSHForm() form_gpg = GPGForm() - form_ssh = SSHForm() - form = None if request.method == 'POST': + form = None action = request.POST['action'] if action == 'update_ssh': form_ssh = SSHForm( request.POST ) @@ -122,15 +122,24 @@ elif action == 'update_gpg': pass else: - keys_data = dict({'action':'update_ssh'}) - keys = request.user.authorized_keys.split('###') - i = 1 - for key in keys: - key_str = 'key_'+str(i) - keys_data[ key_str ] = key - i += 1 + if request.user.authorized_keys != '': + keys_data = dict({'action':'update_ssh'}) + keys = request.user.authorized_keys.split('###') + i = 1 + for key in keys: + key_str = 'key_'+str(i) + keys_data[ key_str ] = key + i += 1 + form_ssh = SSHForm( keys_data ) + else: + form_ssh = SSHForm() - form_ssh = SSHForm( keys_data ) + if request.user.gpg_key != '': + gpg_data = dict({'action':'update_gpg', 'gpg_key':request.user.gpg_key}) + form_gpg = GPGForm( gpg_data ) + else: + form_gpg = GPGForm() + return render_to_response( 'savane_user/ssh_gpg.html', RequestContext( request,