fix str to UserProfileFilters

feature/docker
Dmitriy Shesterkin 9 years ago
parent 2c8a71eaa0
commit 0de5340f1a
  1. 4
      project/customer/admin.py
  2. 10
      project/customer/models.py

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin from django.contrib import admin
import forms from customer import forms
import models from customer import models
class UserProfileAdmin(admin.ModelAdmin): class UserProfileAdmin(admin.ModelAdmin):

@ -7,11 +7,10 @@ from pytils import numeral
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from django.db import models from django.db import models
from django.conf import settings
from django.db.models import Max from django.db.models import Max
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from . import consts, managers, utils from customer import consts, managers, utils
from myauth.models import DokUser from myauth.models import DokUser
from project.commons.utils import only_numerics from project.commons.utils import only_numerics
@ -27,7 +26,7 @@ def get_profile(user):
"""Возвращает профиль пользователя или None.""" """Возвращает профиль пользователя или None."""
try: try:
return user.profile return user.profile
except: except :
return None return None
@ -348,7 +347,6 @@ class Client(models.Model):
else: else:
return (u'%s, ИНН %s' % (self.name, self.inn or u'не указан',)).strip() return (u'%s, ИНН %s' % (self.name, self.inn or u'не указан',)).strip()
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
self.inn = only_numerics(self.inn) self.inn = only_numerics(self.inn)
self.kpp = only_numerics(self.kpp) self.kpp = only_numerics(self.kpp)
@ -413,8 +411,8 @@ class UserProfileFilters(models.Model):
verbose_name = u'Фильтры реквизитов' verbose_name = u'Фильтры реквизитов'
verbose_name_plural = u'Фильтры реквизитов' verbose_name_plural = u'Фильтры реквизитов'
def __unicode__(self): def __unicode__(self): # TODO fix name
return u'%s' % self.user.email return u'{}'.format(self.company.email)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
# всегда включены # всегда включены

Loading…
Cancel
Save