yul
/
bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes change password view

This commit is contained in:
Mouse Reeve 2021-02-06 22:37:40 -08:00
parent 6b10e487b6
commit ee2b656b08
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bookwyrm/models/activitypub_mixin.py
View File

@ -384,9 +384,10 @@ class ActivityMixin(ActivitypubMixin):
def to_undo_activity(self): def to_undo_activity(self):
''' undo an action ''' ''' undo an action '''
user = self.user if hasattr(self, 'user') else self.user_subject
return activitypub.Undo( return activitypub.Undo(
id='%s#undo' % self.remote_id, id='%s#undo' % self.remote_id,
actor=self.user.remote_id, actor=user.remote_id,
object=self.to_activity() object=self.to_activity()
).serialize() ).serialize()

4
bookwyrm/views/password.py
View File

@ -79,7 +79,7 @@ class PasswordReset(View):
return TemplateResponse(request, 'password_reset.html', data) return TemplateResponse(request, 'password_reset.html', data)
user.set_password(new_password) user.set_password(new_password)
user.save() user.save(broadcast=False)
login(request, user) login(request, user)
reset_code.delete() reset_code.delete()
return redirect('/') return redirect('/')
@ -106,6 +106,6 @@ class ChangePassword(View):
return redirect('preferences/password') return redirect('preferences/password')
request.user.set_password(new_password) request.user.set_password(new_password)
request.user.save() request.user.save(broadcast=False)
login(request, request.user) login(request, request.user)
return redirect(request.user.local_path) return redirect(request.user.local_path)