From fdb88b0107a1e12e2fc79c8664342bdef80f2870 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Mon, 19 Mar 2018 13:45:29 +0300
Subject: [PATCH] fix bugs

---
 mapapp/templates/maps/dot.html               |  3 ++-
 mapapp/templates/maps/modal_add_dot.html     |  4 ++--
 migrate_to_0.2.py                            | 25 +++++++++++++++++---
 taskapp/templates/taskapp/add_edit_task.html |  3 ++-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/mapapp/templates/maps/dot.html b/mapapp/templates/maps/dot.html
index e163401..90226f3 100644
--- a/mapapp/templates/maps/dot.html
+++ b/mapapp/templates/maps/dot.html
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load bootstrap3 %}
+{% load globaltags %}
 {% block main %}
 
 <ol class="breadcrumb">
@@ -20,7 +21,7 @@
 <div class="row">
     <div class="{% if dot.id %}col-sm-6{% else %}col-sm-12{% endif %}">
         <form role="form" action="{{ form_url }}" method="post" enctype="multipart/form-data">{% csrf_token %}
-            <input type="hidden" name="MAX_FILE_SIZE" value="{{ FILE_UPLOAD_MAX_MEMORY_SIZE }}"/>
+            <input type="hidden" name="MAX_FILE_SIZE" value="{% global_var 'FILE_UPLOAD_MAX_MEMORY_SIZE' %}"/>
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <h3 class="panel-title">{% trans 'Map point' %}</h3>
diff --git a/mapapp/templates/maps/modal_add_dot.html b/mapapp/templates/maps/modal_add_dot.html
index d8ca96f..33d639a 100644
--- a/mapapp/templates/maps/modal_add_dot.html
+++ b/mapapp/templates/maps/modal_add_dot.html
@@ -1,6 +1,6 @@
-{% load i18n %}{% load bootstrap3 %}
+{% load i18n %}{% load bootstrap3 %}{% load globaltags %}
 <form action="{% url 'mapapp:modal_add_dot' %}" class="form-ajax" method="post" enctype="multipart/form-data">{% csrf_token %}
-    <input type="hidden" name="MAX_FILE_SIZE" value="{{ FILE_UPLOAD_MAX_MEMORY_SIZE }}"/>
+    <input type="hidden" name="MAX_FILE_SIZE" value="{% global_var 'FILE_UPLOAD_MAX_MEMORY_SIZE' %}"/>
     <div class="modal-header primary">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h4 class="modal-title"><span class="glyphicon glyphicon-warning-sign"></span>{% trans 'Add point' %}</h4>
diff --git a/migrate_to_0.2.py b/migrate_to_0.2.py
index 04bc032..3393850 100755
--- a/migrate_to_0.2.py
+++ b/migrate_to_0.2.py
@@ -117,7 +117,22 @@ def dump_abonapp():
 
 def dump_tariffs():
     from tariff_app import models
-    res = get_fixture_from_unchanget_model('tariff_app.tariff', models.Tariff)
+    from abonapp.models import AbonGroup
+    print('tariff_app.tariff')
+    res = [{
+        'model': 'tariff_app.tariff',
+        'pk': trf.pk,
+        'fields': {
+            'title': trf.title,
+            'descr': trf.descr,
+            'speedIn': trf.speedIn,
+            'speedOut': trf.speedOut,
+            'amount': trf.amount,
+            'calc_type': trf.calc_type,
+            'is_admin': trf.is_admin,
+            'groups': [ag.pk for ag in AbonGroup.objects.filter(tariffs__in=[trf])]
+        }
+    } for trf in models.Tariff.objects.all()]
 
     res += get_fixture_from_unchanget_model('tariff_app.periodicpay', models.PeriodicPay)
 
@@ -132,11 +147,15 @@ def dump_devs():
         'pk': dv.pk,
         'fields': {
             'ip_address': dv.ip_address,
-            'mac_addr': dv.mac_addr,
+            'mac_addr': str(dv.mac_addr) if dv.mac_addr else None,
+            'comment': dv.comment,
             'devtype': dv.devtype,
             'man_passw': dv.man_passw,
             'group': dv.user_group.pk if dv.user_group else None,
-            'parent_dev': dv.parent_dev.pk if dv.parent_dev else None
+            'parent_dev': dv.parent_dev.pk if dv.parent_dev else None,
+            'snmp_item_num': dv.snmp_item_num,
+            'status': dv.status,
+            'is_noticeable': dv.is_noticeable
         }
     } for dv in models.Device.objects.all()]
 
diff --git a/taskapp/templates/taskapp/add_edit_task.html b/taskapp/templates/taskapp/add_edit_task.html
index 2f5596a..a72f806 100644
--- a/taskapp/templates/taskapp/add_edit_task.html
+++ b/taskapp/templates/taskapp/add_edit_task.html
@@ -1,6 +1,7 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% load i18n %}
 {% load bootstrap3 %}
+{% load globaltags %}
 {% block main %}
 
     <ol class="breadcrumb">
@@ -28,7 +29,7 @@
                     {% else %}
                         <form role="form" action="{% url 'taskapp:add' %}" method="post" enctype="multipart/form-data">
                     {% endif %}
-                    {% csrf_token %}<input type="hidden" name="MAX_FILE_SIZE" value="{{ FILE_UPLOAD_MAX_MEMORY_SIZE }}"/>
+                    {% csrf_token %}<input type="hidden" name="MAX_FILE_SIZE" value="{% global_var 'FILE_UPLOAD_MAX_MEMORY_SIZE' %}"/>
 
                     {% bootstrap_icon 'tag' as ic %}
                     {% bootstrap_field form.descr addon_before=ic %}