From 5ca9e32c2c6a3532aa0a06bdcad10acac46a2ed1 Mon Sep 17 00:00:00 2001
From: Slava Kyrachevsky <slava.deb@gmail.com>
Date: Fri, 23 Jun 2017 15:50:28 +0300
Subject: [PATCH] =?UTF-8?q?t92:=20=D1=81=D1=84=D0=BE=D1=80=D0=BC=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA?=
 =?UTF-8?q?=D1=83=20=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=D1=87=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/country/admin.py                         |  2 +-
 templates/c_admin/country/country_add.html    |  2 +-
 templates/c_admin/country/country_list.html   | 28 +++++++++----------
 .../specialist_catalog/catalog_detailed.html  |  4 +--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/country/admin.py b/apps/country/admin.py
index df71991a..877fa7b1 100644
--- a/apps/country/admin.py
+++ b/apps/country/admin.py
@@ -81,7 +81,7 @@ def country_change(request, url):
                 'logo': c.logo}
 
         if c.capital:
-            data['capital'] = c.capital.id
+            data['capital'] = c.capital_id
 
         #data from translated fields
         for code, name in settings.LANGUAGES:
diff --git a/templates/c_admin/country/country_add.html b/templates/c_admin/country/country_add.html
index f57df259..d0020e09 100644
--- a/templates/c_admin/country/country_add.html
+++ b/templates/c_admin/country/country_add.html
@@ -50,7 +50,7 @@
             {# capital #}
             <div class="control-group {% if form.capital.errors %}error{% endif %}">
                 <label class="control-label">{{ form.capital.label }}:</label>
-                    <div class="controls">{{ form.capital}}
+                    <div class="controls">{{ form.capital }}
                         <span class="help-inline">{{  form.capital.errors }}</span>
                     </div>
             </div>
diff --git a/templates/c_admin/country/country_list.html b/templates/c_admin/country/country_list.html
index 9a380d34..857301d1 100644
--- a/templates/c_admin/country/country_list.html
+++ b/templates/c_admin/country/country_list.html
@@ -21,21 +21,21 @@
     </div>
     <div class="box-content">
         <table class="table table-hover">
-			<thead>
-			<tr>
+            <thead>
+            <tr>
               <th>id</th>
-			  <th>Страна</th>
-			  <th>Столица</th>
+              <th>Страна</th>
+              <th>Столица</th>
               <th>&nbsp;</th>
-			</tr>
-			</thead>
-		  <tbody>
+            </tr>
+            </thead>
+          <tbody>
           {% for item in object_list %}
-			<tr>
+            <tr>
               <td>{{ item.id }}</td>
-			  <td>{{ item.name }}</td>
-			  <td>{% ifnotequal item.capital None %}{{ item.capital }} {% endifnotequal %}</td>
-			  <td class="center sorting_1">
+              <td>{{ item.name }}</td>
+              <td>{{ item.capital|default_if_none:'' }}</td>
+              <td class="center sorting_1">
                   <a class="btn btn-info" href="/admin/country/change/{{ item.url|lower }}">
                   <i class="icon-edit icon-white"></i> Изменить
                   </a>
@@ -44,10 +44,10 @@
                   </a>
               </td>
 
-			</tr>
+            </tr>
           {% endfor %}
-		  </tbody>
-	</table>
+          </tbody>
+    </table>
     <a class="btn btn-success" href="/admin/country/add"><i class="icon-plus-sign icon-white"></i> Добавить страну</a>
 
 </div>
diff --git a/templates/client/specialist_catalog/catalog_detailed.html b/templates/client/specialist_catalog/catalog_detailed.html
index d9f4776a..43df105a 100644
--- a/templates/client/specialist_catalog/catalog_detailed.html
+++ b/templates/client/specialist_catalog/catalog_detailed.html
@@ -230,9 +230,9 @@
                                 <div class="rqob-button">
                                     {# вместо формы выше временно ставим ссылку на партнёров #}
                                     {% if object.type == 1 %}
-                                        <a class="ob-text" href="#">{% trans 'заказать услугу' %}</a>
+                                        <a class="ob-text link" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ object.place.capital }}" target="_blank">{% trans 'найти переводчика' %}</a>
                                     {% else %}
-                                        <a class="ob-text link" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ object.place }}" target="_blank">{% trans 'заказать услугу' %}</a>
+                                        <a class="ob-text link" href="https://www.interpreters.travel/ru/new_partner_search?partner_id=44&search[city_name]={{ object.place }}" target="_blank">{% trans 'найти переводчика' %}</a>
                                     {% endif %}
                                 </div>
                             </div>