Browse Source

add default orering to models and fix translation in ext.htm in accounts_app templates

devel
bashmak 8 years ago
parent
commit
c86e142614
  1. 4
      abonapp/models.py
  2. 6
      accounts_app/locale/ru/LC_MESSAGES/django.po
  3. 1
      accounts_app/models.py
  4. 3
      chatbot/models.py
  5. 1
      devapp/models.py
  6. 1
      dialing_app/models.py
  7. 1
      mapapp/models.py
  8. 1
      msg_app/models.py
  9. 1
      statistics/models.py
  10. 1
      taskapp/models.py

4
abonapp/models.py

@ -302,6 +302,7 @@ class PassportInfo(models.Model):
db_table = 'passport_info' db_table = 'passport_info'
verbose_name = _('Passport Info') verbose_name = _('Passport Info')
verbose_name_plural = _('Passport Info') verbose_name_plural = _('Passport Info')
ordering = ['series']
def __str__(self): def __str__(self):
return "%s %s" % (self.series, self.number) return "%s %s" % (self.series, self.number)
@ -409,7 +410,7 @@ class AdditionalTelephone(models.Model):
class Meta: class Meta:
db_table = 'additional_telephones' db_table = 'additional_telephones'
ordering = ('owner_name',)
ordering = ['owner_name']
permissions = ( permissions = (
('can_view_additionaltelephones', _('Can view additional telephones')), ('can_view_additionaltelephones', _('Can view additional telephones')),
) )
@ -448,6 +449,7 @@ class PeriodicPayForId(models.Model):
class Meta: class Meta:
db_table = 'periodic_pay_for_id' db_table = 'periodic_pay_for_id'
ordering = ['last_pay']
@receiver(post_delete, sender=Abon) @receiver(post_delete, sender=Abon)

6
accounts_app/locale/ru/LC_MESSAGES/django.po

@ -299,3 +299,9 @@ msgstr "Редактировать"
msgid "Access to groups" msgid "Access to groups"
msgstr "Доступ к группам" msgstr "Доступ к группам"
msgid "Administrator"
msgstr "Сотрудник"
msgid "Manage responsibility groups"
msgstr "Ответственность за группы"

1
accounts_app/models.py

@ -86,6 +86,7 @@ class BaseAccount(AbstractBaseUser, PermissionsMixin):
class Meta: class Meta:
db_table = 'base_accounts' db_table = 'base_accounts'
ordering = ['username']
class UserProfileManager(MyUserManager): class UserProfileManager(MyUserManager):

3
chatbot/models.py

@ -20,6 +20,7 @@ class TelegramBot(models.Model):
db_table = 'chat_telegram_bot' db_table = 'chat_telegram_bot'
verbose_name = _('Telegram bot') verbose_name = _('Telegram bot')
verbose_name_plural = _('Telegram bots') verbose_name_plural = _('Telegram bots')
ordering = ['chat_id']
class MessageHistory(models.Model): class MessageHistory(models.Model):
@ -34,6 +35,7 @@ class MessageHistory(models.Model):
db_table = 'chat_message_history' db_table = 'chat_message_history'
verbose_name = _('Message history') verbose_name = _('Message history')
verbose_name_plural = _('Message histories') verbose_name_plural = _('Message histories')
ordering = ['-date_sent']
class MessageQueueManager(models.Manager): class MessageQueueManager(models.Manager):
@ -68,3 +70,4 @@ class MessageQueue(models.Model):
db_table = 'chat_message_queue' db_table = 'chat_message_queue'
verbose_name = _('Message queue') verbose_name = _('Message queue')
verbose_name_plural = _('Message queue') verbose_name_plural = _('Message queue')
ordering = ['target_employee__username']

1
devapp/models.py

@ -138,3 +138,4 @@ class Port(models.Model):
) )
verbose_name = _('Port') verbose_name = _('Port')
verbose_name_plural = _('Ports') verbose_name_plural = _('Ports')
ordering = ['num']

1
dialing_app/models.py

@ -110,6 +110,7 @@ class SMSOut(models.Model):
) )
verbose_name = _('Out SMS') verbose_name = _('Out SMS')
verbose_name_plural = _('Out SMS') verbose_name_plural = _('Out SMS')
ordering = ['-when']
def __str__(self): def __str__(self):
return self.text return self.text

1
mapapp/models.py

@ -14,6 +14,7 @@ class Dot(models.Model):
db_table = 'dots' db_table = 'dots'
verbose_name = _('Map point') verbose_name = _('Map point')
verbose_name_plural = _('Map points') verbose_name_plural = _('Map points')
ordering = ['title']
permissions = ( permissions = (
('can_view', _('Can view')), ('can_view', _('Can view')),
) )

1
msg_app/models.py

@ -243,3 +243,4 @@ class Conversation(models.Model):
permissions = ( permissions = (
('can_view_conversation', _('Can view conversation')), ('can_view_conversation', _('Can view conversation')),
) )
ordering = ['title']

1
statistics/models.py

@ -127,3 +127,4 @@ class StatCache(models.Model):
class Meta: class Meta:
db_table = 'flowcache' db_table = 'flowcache'
ordering = ['-last_time']

1
taskapp/models.py

@ -132,3 +132,4 @@ class ExtraComment(models.Model):
) )
verbose_name = _('Extra comment') verbose_name = _('Extra comment')
verbose_name_plural = _('Extra comments') verbose_name_plural = _('Extra comments')
ordering = ['-date_create']
Loading…
Cancel
Save