From 7f88375df580a741a63db662bef79ed3b1bfddae Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Mon, 29 Aug 2016 21:39:31 +0300
Subject: [PATCH] #ARC-13 Section 18

---
 assets/index.js                                 |  1 +
 common/migrations/0009_merge.py                 | 16 ++++++++++++++++
 projects/forms.py                               | 17 ++---------------
 projects/migrations/0021_merge.py               | 16 ++++++++++++++++
 projects/templates/project_filter.html          |  2 +-
 projects/views.py                               |  6 +-----
 templates/home.html                             |  4 ++--
 .../contractor_office_open_projects.html        |  2 +-
 work_sell/migrations/0008_merge.py              | 16 ++++++++++++++++
 9 files changed, 56 insertions(+), 24 deletions(-)
 create mode 100644 common/migrations/0009_merge.py
 create mode 100644 projects/migrations/0021_merge.py
 create mode 100644 work_sell/migrations/0008_merge.py

diff --git a/assets/index.js b/assets/index.js
index 3b5bcd1..b047eb3 100644
--- a/assets/index.js
+++ b/assets/index.js
@@ -4,6 +4,7 @@ $('.datepicker').datepicker()
 
 $('[data-tooltip]').tooltip({
     container: 'body', // Remove unwanted side-effects
+    trigger : 'hover', // Disable tooltip remaining visible after a click
 })
 
 
diff --git a/common/migrations/0009_merge.py b/common/migrations/0009_merge.py
new file mode 100644
index 0000000..c10046b
--- /dev/null
+++ b/common/migrations/0009_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 17:21
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0006_settings_noreply_email'),
+        ('common', '0008_auto_20160829_1923'),
+    ]
+
+    operations = [
+    ]
diff --git a/projects/forms.py b/projects/forms.py
index 41cd1fb..01f57f1 100644
--- a/projects/forms.py
+++ b/projects/forms.py
@@ -161,24 +161,11 @@ class RealtyForm(forms.ModelForm):
         self.request = kwargs.pop('request')
         super().__init__(*args, **kwargs)
         
-        self.fields['name'].required = False
+        if not self.data.get('extra_fields'):
+            self.fields['name'].required = False
         
         self.fields['location'].queryset = Location.objects.root_nodes()[0].get_descendants()
         # self.fields['location'].queryset = Location.objects # Migrate with this enabled
-    
-    def clean_name(self):
-        name = self.cleaned_data.get('name')
-        
-        if not name:
-            if self.data.get('extra_fields'):
-                raise forms.ValidationError('Это поле обязательно')
-            else:
-                if self.instance.pk:
-                    name = self.instance.name
-                else:
-                    name = 'Новый объект %s' % util.random_ident(length=20)
-        
-        return name
 
 
 class PortfolioForm(forms.ModelForm):
diff --git a/projects/migrations/0021_merge.py b/projects/migrations/0021_merge.py
new file mode 100644
index 0000000..efcc798
--- /dev/null
+++ b/projects/migrations/0021_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 17:21
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0018_auto_20160829_1837'),
+        ('projects', '0020_stage_term'),
+    ]
+
+    operations = [
+    ]
diff --git a/projects/templates/project_filter.html b/projects/templates/project_filter.html
index 154f280..8c446cf 100644
--- a/projects/templates/project_filter.html
+++ b/projects/templates/project_filter.html
@@ -180,7 +180,7 @@
                                 <a href="{% url 'projects:detail' pk=project.pk %}">{{ project.name }}</a>
                             </p>
                             
-                            {% if project.realty %}
+                            {% if project.realty and project.realty.name %}
                                 <ul class="desPro">
                                     <li>
                                         Объект "{{ project.realty.name }}"
diff --git a/projects/views.py b/projects/views.py
index 1f0ca0d..67be51a 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -365,11 +365,7 @@ class CustomerProjectCreateView(BaseMixin, View):
             project.save()
             form.save_m2m()
 
-            secure = False
-            if 'secure_deal' in project.deal_type:
-                secure = True
-
-            Order.objects.create(project=project, secure=secure)
+            Order.objects.create(project=project, secure=project.deal_type == 'secure_deal')
             
             for file in request.FILES.getlist('new_files'):
                 ProjectFile.objects.create(file=file, project=project)
diff --git a/templates/home.html b/templates/home.html
index 38d09bd..03d2bcc 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -20,7 +20,7 @@
                             <a href="{% url 'registration_register' %}?type=contractor">Я исполнитель</a>
                         {% endif %}
 						<p>
-							{{ main_settings.contractor_text }}
+							{{ main_settings.contractor_text|linebreaksbr }}
                         </p>
 					</div>
 					<div class="square">
@@ -35,7 +35,7 @@
 						    <a href="{% url 'registration_register' %}?type=customer">Я заказчик</a>
                         {% endif %}
 						<p>
-							{{ main_settings.customer_text }}
+							{{ main_settings.customer_text|linebreaksbr }}
                         </p>
 					</div>
 				</div>
diff --git a/users/templates/contractor_office_open_projects.html b/users/templates/contractor_office_open_projects.html
index fb45086..306191d 100644
--- a/users/templates/contractor_office_open_projects.html
+++ b/users/templates/contractor_office_open_projects.html
@@ -44,7 +44,7 @@
                                 <p class="titlePro">{{ project.name }}</p>
                             </a>
                             
-                            {% if project.realty %}
+                            {% if project.realty and project.realty.name %}
                                 <ul class="desPro">
                                     <li>Объект "{{ project.realty.name }}"</li>
                                 </ul>
diff --git a/work_sell/migrations/0008_merge.py b/work_sell/migrations/0008_merge.py
new file mode 100644
index 0000000..2d9e0b8
--- /dev/null
+++ b/work_sell/migrations/0008_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-29 17:21
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('work_sell', '0007_auto_20160829_1740'),
+        ('work_sell', '0007_auto_20160829_1837'),
+    ]
+
+    operations = [
+    ]