Download as
Browse Code »

Commit 7a4831cffabe882e322dfb1e6c08957472ff153c

Authored by Luan
1 parent 53de9493
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Minor fixes and refactoring

Showing 2 changed files with 2 additions and 9 deletions   Show diff stats
src/accounts/models.py
  Diff comments   View file @7a4831c
@@ -23,20 +23,14 @@ class User(AbstractUser): @@ -23,20 +23,14 @@ class User(AbstractUser):
23 modified = models.DateTimeField(auto_now=True) 23 modified = models.DateTimeField(auto_now=True)
24 24
25 def check_password(self, raw_password): 25 def check_password(self, raw_password):
26 - """  
27 - Returns a boolean of whether the raw_password was correct. Handles  
28 - hashing formats behind the scenes.  
29 - """  
30 - def setter(raw_password):  
31 - self.set_password(raw_password)  
32 - self.save(update_fields=["password"]) 26 + is_correct_ = super(User, self).check_password(raw_password)
33 27
34 if self.xmpp.exists(): 28 if self.xmpp.exists():
35 is_correct = raw_password == self.xmpp.all()[0].password 29 is_correct = raw_password == self.xmpp.all()[0].password
36 if is_correct: 30 if is_correct:
37 return is_correct 31 return is_correct
38 32
39 - return check_password(raw_password, self.password, setter) 33 + return is_correct_
40 34
41 def get_absolute_url(self): 35 def get_absolute_url(self):
42 return reverse('user_profile', kwargs={'username': self.username}) 36 return reverse('user_profile', kwargs={'username': self.username})
src/accounts/views.py
  Diff comments   View file @7a4831c
@@ -212,7 +212,6 @@ class ChangeXMPPPasswordView(UpdateView): @@ -212,7 +212,6 @@ class ChangeXMPPPasswordView(UpdateView):
212 return response 212 return response
213 else: 213 else:
214 self.request.user.set_password(form.cleaned_data['password1']) 214 self.request.user.set_password(form.cleaned_data['password1'])
215 - self.request.user.save()  
216 transaction.commit() 215 transaction.commit()
217 216
218 messages.success( 217 messages.success(