Skip to content

Commit

Permalink
password reset: fix password error display
Browse files Browse the repository at this point in the history
  • Loading branch information
wardi committed Feb 19, 2018
1 parent bcc4b7d commit 9743841
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion ckan/controllers/user.py
Expand Up @@ -554,7 +554,10 @@ def perform_reset(self, id):
except DataError:
h.flash_error(_(u'Integrity Error'))
except ValidationError, e:
h.flash_error(u'%r' % e.error_dict)
if u'password' in e.error_dict:
h.flash_error(u''.join(e.error_dict['password']))
else:
h.flash_error(e.error_dict)
except ValueError, ve:
h.flash_error(unicode(ve))
user_dict['state'] = user_state
Expand Down

0 comments on commit 9743841

Please sign in to comment.