diff --git a/chat/templates/chat_contractor.html b/chat/templates/chat_contractor.html index 60ecad5..263fcd0 100644 --- a/chat/templates/chat_contractor.html +++ b/chat/templates/chat_contractor.html @@ -101,7 +101,7 @@

{{ order }}

Исполнитель: {{ request.user.get_full_name }}

-

Чаты: Иванов, Петров

+ Полное описание заказа diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index 84f99e9..7a71afe 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -299,7 +299,7 @@ '

Этап 1

' + '' + '' + - ' />' + + '' + '' + '' + '
'; @@ -400,11 +400,19 @@ $('#order-stages-tab').on('change', '#countStage', function () { var countStage = parseInt($(this).val()); + var currentCountStage = $(".numberStepp").length; + alert(countStage); + alert(currentCountStage); + var updateFormStages = $(".update-stages-form"); var limitCount = countStage + 1; for (var i = 2; i < limitCount; i++) { var stageCopy = $("#stage1").clone().attr("id", "stage" + i).addClass("stages_form"); + stageCopy.find('.stage-span-id').html(i); + //var j = i-1; + // var prevStage = "#stage" + j; $("#stage1").after(stageCopy); + } }); diff --git a/projects/templates/contractor_portfolio_edit.html b/projects/templates/contractor_portfolio_edit.html index b9c1425..8cc9990 100644 --- a/projects/templates/contractor_portfolio_edit.html +++ b/projects/templates/contractor_portfolio_edit.html @@ -90,8 +90,9 @@ diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index 09bdffa..d4ae9da 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -148,7 +148,7 @@ {% endif %}
- {% for p in user.portfolios.all %} + {% for p in contractor.portfolios.all %}

{{ p.name }}

+ {% if request.user.pk == contractor.pk %} + {% endif %}
{% endfor %} @@ -212,7 +214,7 @@ {% endif %}
-

{{ user.get_full_name }}

+

{{ contractor.get_full_name }}

{% if contractor.contractor_resume.resume_file %}
скачать резюме {% endif %}

- Мужчина, 24 года, {{ user.date_of_birth }}#} + {{ contractor.gender }}, {{ contractor.date_of_birth }}

diff --git a/work_sell/views.py b/work_sell/views.py index 86c46d6..21d9034 100644 --- a/work_sell/views.py +++ b/work_sell/views.py @@ -11,7 +11,7 @@ from django.contrib import messages from django.db.models import Q from django.core.urlresolvers import reverse from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from django.http import JsonResponse, HttpResponse +from django.http import JsonResponse, HttpResponse, HttpResponseForbidden from django.core.files.base import ContentFile from django.views.generic import ListView, DetailView, CreateView, View, \ UpdateView, DeleteView, TemplateView @@ -86,7 +86,7 @@ class WorkSellFilterView(BaseMixin,View): keywords = tuple(filter(None, re.split(r'\s|,|;', keywords))) for k in keywords: - work_sells = work_sells.filter(Q(name__icontains=k) | Q(text__icontains=k)) + work_sells = work_sells.filter(Q(name__icontains=k) | Q(description__icontains=k)) if specialization: work_sells = work_sells.filter( @@ -127,9 +127,6 @@ class WorkSellFilterView(BaseMixin,View): return render(request, self.template_name, context) - - - class WorkSellDetail(DetailView): model = WorkSell template_name = 'worksell_detail.html' @@ -174,6 +171,12 @@ class WorkSellUpdateView(UpdateView): form_class = WorkSellForm template_name = 'worksell_edit.html' + def dispatch(self, request, *args, **kwargs): + # import code; code.interact(local=dict(globals(), **locals())) + if self.get_object().contractor_id != request.user.pk: + return HttpResponseForbidden('403 Forbidden') + return super().dispatch(request, *args, **kwargs) + def get_success_url(self): return reverse('work_sell:list')