diff --git a/assets/js/chat_customer.js b/assets/js/chat_customer.js
index ebc8f3a..fab9143 100644
--- a/assets/js/chat_customer.js
+++ b/assets/js/chat_customer.js
@@ -70,6 +70,7 @@ $(function () {
} else {
$("#stages-pay-form #stagesIds").val(currIdStage);
$("#stagesSelect").prop('disabled', false);
+ $(".stageSum").text(sumStage);
}
});
diff --git a/chat/chat.py b/chat/chat.py
index 57786f5..3da067e 100644
--- a/chat/chat.py
+++ b/chat/chat.py
@@ -127,7 +127,7 @@ class ChatHandler(websocket.WebSocketHandler):
sender_name = msg_data[5]
msg_time = msg_data[2].strftime("%Y-%m-%d %H:%M:%S")
if docs_links:
- message += '
' + docs_links;
+ message += '
' + docs_links
if message_type:
waiters = tuple(w for c, w in self.waiters if c == recipent_id)
diff --git a/projects/forms.py b/projects/forms.py
index 3324403..ec0e9b3 100644
--- a/projects/forms.py
+++ b/projects/forms.py
@@ -149,8 +149,14 @@ class CustomerProjectEditForm(forms.ModelForm):
class RealtyForm(forms.ModelForm):
- building_classification = TreeNodeChoiceField(BuildingClassfication.objects.all(),
- widget=forms.Select(attrs={'class': 'selectpicker'}))
+ building_classification = TreeNodeChoiceField(
+ BuildingClassfication.objects.all(),
+ label="", initial='',
+ widget=forms.Select(attrs={
+ 'class': 'selectpicker',
+ 'id': 'realtyBuildingClassificationId'
+ })
+ )
class Meta:
model = Realty
diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html
index 8401561..de92916 100644
--- a/users/templates/contractor_filter.html
+++ b/users/templates/contractor_filter.html
@@ -445,11 +445,11 @@
if (project.order.team && project.order.team.id === teamId) {
window.location.href = projectOrderChatUrl
} else {
- var msg = 'Вашей команде предлагается проект http://{{ request.get_host }}' + projectUrl
+ var msg = 'Вашей команде предлагается проект http://{{ request.get_host }}' + projectUrl +''
socketMain.add_message({
format_type: 'add_message_contact',
-
+ message_type: 'invite_order',
data: {
sender_id: String(customerId),
recipent_id: String(contractorId),
@@ -466,11 +466,11 @@
if (project.order.contractor && project.order.contractor.id === contractorId) {
window.location.href = projectOrderChatUrl
} else {
- var msg = 'Вам предлагается проект http://{{ request.get_host }}' + projectUrl
+ var msg = 'Вам предлагается проект http://{{ request.get_host }}' + projectUrl +''
socketMain.add_message({
format_type: 'add_message_contact',
-
+ message_type: 'invite_order',
data: {
sender_id: String(customerId),
recipent_id: String(contractorId),
diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html
index bea0be9..9ffe693 100644
--- a/users/templates/contractor_profile.html
+++ b/users/templates/contractor_profile.html
@@ -1140,8 +1140,7 @@
}
}).prop('disabled', !$.support.fileInput)
.parent().addClass($.support.fileInput ? undefined : 'disabled');
-
-
+
function add_resume_file(resumeType, imgUrl,imgPk, galleryId){
$.ajax({