Download as
Browse Code »

Commit 1d346cf0cd0231316cddb64ef21619379c9bf96d

Authored by Sergio Oliveira
1 parent 57a4c556
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

Simpler check_password

Showing 1 changed file with 3 additions and 6 deletions   Show diff stats
src/accounts/models.py
  Diff comments   View file @1d346cf
@@ -23,14 +23,11 @@ class User(AbstractUser): @@ -23,14 +23,11 @@ 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 - is_correct_ = super(User, self).check_password(raw_password)  
27 26
28 - if self.xmpp.exists():  
29 - is_correct = raw_password == self.xmpp.all()[0].password  
30 - if is_correct:  
31 - return is_correct 27 + if self.xmpp.exists() and raw_password == self.xmpp.first().password:
  28 + return True
32 29
33 - return is_correct_ 30 + return super(User, self).check_password(raw_password)
34 31
35 def get_absolute_url(self): 32 def get_absolute_url(self):
36 return reverse('user_profile', kwargs={'username': self.username}) 33 return reverse('user_profile', kwargs={'username': self.username})