conflicts resolved
This commit is contained in:
commit
316a9448a4
3 changed files with 5 additions and 0 deletions
|
@ -33,6 +33,9 @@ class Profile(models.Model):
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.full_name
|
return self.full_name
|
||||||
|
|
||||||
|
def birthday():
|
||||||
|
return self.birth_date.strftime("%d%m")
|
||||||
|
|
||||||
|
|
||||||
class Department(models.Model):
|
class Department(models.Model):
|
||||||
name = models.CharField(max_length=255, verbose_name=_("nom du département"))
|
name = models.CharField(max_length=255, verbose_name=_("nom du département"))
|
||||||
|
|
|
@ -12,4 +12,5 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
|
@ -38,6 +38,7 @@ def fiche_modif(request):
|
||||||
|
|
||||||
return render(request, "fiches/fiches_modif.html", {"form": form})
|
return render(request, "fiches/fiches_modif.html", {"form": form})
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def home(request):
|
def home(request):
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
|
|
Loading…
Reference in a new issue