Don't change the password of another member (+ minor fixes on WEI app)

apps/member/models.py

@@ -119,7 +119,7 @@ class Profile(models.Model):
     def soge(self):
         if "treasury" in settings.INSTALLED_APPS:
             from treasury.models import SogeCredit
-            return SogeCredit.objects.filter(user=self.user, credit_transaction=None).exists()
+            return SogeCredit.objects.filter(user=self.user, credit_transaction__isnull=False).exists()
         return False
 
     class Meta:

apps/wei/models.py

@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import json
+from datetime import date
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -17,6 +18,7 @@ class WEIClub(Club):
     """
     year = models.PositiveIntegerField(
         unique=True,
+        default=date.today().year,
         verbose_name=_("year"),
     )
 

apps/wei/views.py

@@ -780,7 +780,7 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea
         ret = super().form_valid(form)
 
         membership.refresh_from_db()
-        membership.roles.add(WEIRole.objects.get("Adhérent WEI"))
+        membership.roles.add(WEIRole.objects.get(name="Adhérent WEI"))
 
         return ret
 

templates/member/profile_info.html

@@ -17,12 +17,14 @@
             <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt>
             <dd class="col-xl-6">{{ object.username }}</dd>
 
+            {% if object.pk == user.pk %}
                 <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
                 <dd class="col-xl-6">
                     <a class="small" href="{% url 'password_change' %}">
                         {% trans 'Change password' %}
                     </a>
                 </dd>
+            {% endif %}
 
             <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
             <dd class="col-xl-6">{{ object.profile.section }}</dd>

templates/registration/future_profile_detail.html

@@ -31,13 +31,6 @@
                             </dd>
                         {% endif %}
 
-                        <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
-                        <dd class="col-xl-6">
-                            <a class="small" href="{% url 'password_change' %}">
-                                {% trans 'Change password' %}
-                            </a>
-                        </dd>
-
                         <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
                         <dd class="col-xl-6">{{ object.profile.section }}</dd>
 

templates/wei/weimembership_form.html

@@ -119,8 +119,10 @@
             </dl>
         </div>
         <div class="card-footer text-center">
-            <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' registration.user.pk %}">{% trans 'Update Profile' %}</a>
             <a class="btn btn-primary btn-sm" href="{% url 'wei:wei_update_registration' registration.pk %}">{% trans 'Update registration' %}</a>
+            {% if "auth.change_user"|has_perm:registration.user %}
+                <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' registration.user.pk %}">{% trans 'Update Profile' %}</a>
+            {% endif %}
         </div>
     </div>