diff --git a/chat/templates/chat_contractor.html b/chat/templates/chat_contractor.html
index 263fcd0..3b91f43 100644
--- a/chat/templates/chat_contractor.html
+++ b/chat/templates/chat_contractor.html
@@ -91,7 +91,6 @@
-
Заказы
{% for order in orders %}
diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html
index 7a71afe..ab7bcf4 100644
--- a/chat/templates/chat_customer.html
+++ b/chat/templates/chat_customer.html
@@ -82,7 +82,7 @@
diff --git a/specializations/templates/templatetags/specializations_widget.html b/specializations/templates/templatetags/specializations_widget.html
deleted file mode 100644
index d2aaed3..0000000
--- a/specializations/templates/templatetags/specializations_widget.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
Специализации:
-
- {% for spec in specializations %}
-
- {{ spec }}
- 2-й
-
- {% endfor %}
-
-
-{#
#}
-{#
#}
-{# Специализации:#}
-{#
#}
-{#
#}
-{# Интерьеры#}
-{#
#}
-{# #}
-{#
#}
-{# Визуализация/3D#}
-{#
#}
-{#
#}
diff --git a/templates/partials/base.html b/templates/partials/base.html
index 3450bb2..4918bd8 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -37,7 +37,7 @@
{% endfor %}
{% endif %}
-
+
{{ request.user }}
{% if request.user.is_authenticated %}
diff --git a/users/models.py b/users/models.py
index ef6f9f2..2b3a9a2 100644
--- a/users/models.py
+++ b/users/models.py
@@ -158,6 +158,12 @@ class User(AbstractBaseUser, PermissionsMixin):
def get_profile_image(self):
return self.avatar
+ def get_gender(self):
+ if self.gender:
+ return 'Мужчина' if self.gender == 'male' else 'Женщина'
+ else:
+ return None
+
USERNAME_FIELD = 'username'
REQUIRED_FIELDS = []
objects = UserManager()
diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html
index 1dfb6a7..f2a45f0 100644
--- a/users/templates/contractor_profile.html
+++ b/users/templates/contractor_profile.html
@@ -33,6 +33,12 @@
+
+
+ редактировать профиль
+
+
+
{% endif %}
{% if contractor.pk != request.user.pk and request.user.is_contractor %}
@@ -271,18 +277,18 @@
-
+
+
+
-
+
{% thumbnail contractor.avatar "176x160" crop="center" as im %}
@@ -300,11 +306,12 @@
class="download-summ">скачать резюме
{% endif %}
- {{ contractor.gender }}, {{ contractor.date_of_birth }}
+ {{ contractor.get_gender }}, {{ contractor.date_of_birth }}
+
{% if contractor.website %}
- {{ contractor.website }}
{% endif %}
@@ -325,7 +332,7 @@
- {{ contractor.contractor_resume.text }}
+ {{ contractor.contractor_resume.text | safe }}
@@ -434,6 +441,7 @@
+