remotes/origin/PR-39
Mukhtar 10 years ago
parent 3b82607df1
commit 3ba8c76421
  1. 1
      assets/js/chat_customer.js
  2. 2
      chat/chat.py
  3. 10
      projects/forms.py
  4. 8
      users/templates/contractor_filter.html
  5. 3
      users/templates/contractor_profile.html

@ -70,6 +70,7 @@ $(function () {
} else { } else {
$("#stages-pay-form #stagesIds").val(currIdStage); $("#stages-pay-form #stagesIds").val(currIdStage);
$("#stagesSelect").prop('disabled', false); $("#stagesSelect").prop('disabled', false);
$(".stageSum").text(sumStage);
} }
}); });

@ -127,7 +127,7 @@ class ChatHandler(websocket.WebSocketHandler):
sender_name = msg_data[5] sender_name = msg_data[5]
msg_time = msg_data[2].strftime("%Y-%m-%d %H:%M:%S") msg_time = msg_data[2].strftime("%Y-%m-%d %H:%M:%S")
if docs_links: if docs_links:
message += '<br><br>' + docs_links; message += '<br><br>' + docs_links
if message_type: if message_type:
waiters = tuple(w for c, w in self.waiters if c == recipent_id) waiters = tuple(w for c, w in self.waiters if c == recipent_id)

@ -149,8 +149,14 @@ class CustomerProjectEditForm(forms.ModelForm):
class RealtyForm(forms.ModelForm): class RealtyForm(forms.ModelForm):
building_classification = TreeNodeChoiceField(BuildingClassfication.objects.all(), building_classification = TreeNodeChoiceField(
widget=forms.Select(attrs={'class': 'selectpicker'})) BuildingClassfication.objects.all(),
label="", initial='',
widget=forms.Select(attrs={
'class': 'selectpicker',
'id': 'realtyBuildingClassificationId'
})
)
class Meta: class Meta:
model = Realty model = Realty

@ -445,11 +445,11 @@
if (project.order.team && project.order.team.id === teamId) { if (project.order.team && project.order.team.id === teamId) {
window.location.href = projectOrderChatUrl window.location.href = projectOrderChatUrl
} else { } else {
var msg = 'Вашей команде предлагается проект http://{{ request.get_host }}' + projectUrl var msg = 'Вашей команде предлагается проект <a href="http://{{ request.get_host }}' + projectUrl + '">http://{{ request.get_host }}' + projectUrl +'</a>'
socketMain.add_message({ socketMain.add_message({
format_type: 'add_message_contact', format_type: 'add_message_contact',
message_type: 'invite_order',
data: { data: {
sender_id: String(customerId), sender_id: String(customerId),
recipent_id: String(contractorId), recipent_id: String(contractorId),
@ -466,11 +466,11 @@
if (project.order.contractor && project.order.contractor.id === contractorId) { if (project.order.contractor && project.order.contractor.id === contractorId) {
window.location.href = projectOrderChatUrl window.location.href = projectOrderChatUrl
} else { } else {
var msg = 'Вам предлагается проект http://{{ request.get_host }}' + projectUrl var msg = 'Вам предлагается проект <a href="http://{{ request.get_host }}' + projectUrl + '">http://{{ request.get_host }}' + projectUrl +'</a>'
socketMain.add_message({ socketMain.add_message({
format_type: 'add_message_contact', format_type: 'add_message_contact',
message_type: 'invite_order',
data: { data: {
sender_id: String(customerId), sender_id: String(customerId),
recipent_id: String(contractorId), recipent_id: String(contractorId),

@ -1140,8 +1140,7 @@
} }
}).prop('disabled', !$.support.fileInput) }).prop('disabled', !$.support.fileInput)
.parent().addClass($.support.fileInput ? undefined : 'disabled'); .parent().addClass($.support.fileInput ? undefined : 'disabled');
function add_resume_file(resumeType, imgUrl,imgPk, galleryId){ function add_resume_file(resumeType, imgUrl,imgPk, galleryId){
$.ajax({ $.ajax({

Loading…
Cancel
Save