From 0de5340f1abb74e0db9c49ddbb9b1dab9827a8e5 Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Fri, 28 Apr 2017 02:34:43 +0300 Subject: [PATCH] fix str to UserProfileFilters --- project/customer/admin.py | 4 ++-- project/customer/models.py | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/project/customer/admin.py b/project/customer/admin.py index dc49a05..4b132a7 100644 --- a/project/customer/admin.py +++ b/project/customer/admin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from django.contrib import admin -import forms -import models +from customer import forms +from customer import models class UserProfileAdmin(admin.ModelAdmin): diff --git a/project/customer/models.py b/project/customer/models.py index 0385cfa..b4963a4 100644 --- a/project/customer/models.py +++ b/project/customer/models.py @@ -7,11 +7,10 @@ from pytils import numeral from dateutil.relativedelta import relativedelta from django.db import models -from django.conf import settings from django.db.models import Max from django.core.urlresolvers import reverse -from . import consts, managers, utils +from customer import consts, managers, utils from myauth.models import DokUser from project.commons.utils import only_numerics @@ -27,7 +26,7 @@ def get_profile(user): """Возвращает профиль пользователя или None.""" try: return user.profile - except: + except : return None @@ -348,7 +347,6 @@ class Client(models.Model): else: return (u'%s, ИНН %s' % (self.name, self.inn or u'не указан',)).strip() - def save(self, *args, **kwargs): self.inn = only_numerics(self.inn) self.kpp = only_numerics(self.kpp) @@ -413,8 +411,8 @@ class UserProfileFilters(models.Model): verbose_name = u'Фильтры реквизитов' verbose_name_plural = u'Фильтры реквизитов' - def __unicode__(self): - return u'%s' % self.user.email + def __unicode__(self): # TODO fix name + return u'{}'.format(self.company.email) def save(self, *args, **kwargs): # всегда включены