[models] added verbose_name

openwisp · May 27, 2017 · eadf8c2 · eadf8c2
1 parent 7c57b71
commit eadf8c2
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 84 deletions.
diff --git a/django_freeradius/admin.py b/django_freeradius/admin.py
@@ -1,7 +1,6 @@
 from django.contrib import admin
 
-from .models import (Nas, RadiusAccounting, RadiusChecks, RadiusGroup,
-                     RadiusGroupUsers, RadiusReplies)
+from .models import (Nas, RadiusAccounting, RadiusChecks, RadiusGroup, RadiusGroupUsers, RadiusReplies)
 
 
 @admin.register(RadiusGroup)

diff --git a/django_freeradius/migrations/0001_initial.py b/django_freeradius/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-05-24 11:11
+# Generated by Django 1.11.1 on 2017-05-27 14:12
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -17,14 +17,16 @@ class Migration(migrations.Migration):
             name='Nas',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('nas_name', models.CharField(help_text='NAS Name (or IP address)', max_length=128, unique=True)),
-                ('short_name', models.CharField(max_length=32)),
-                ('type', models.CharField(max_length=30)),
-                ('secret', models.CharField(help_text='Shared Secret', max_length=60)),
-                ('ports', models.IntegerField(blank=True, null=True)),
-                ('community', models.CharField(blank=True, max_length=50, null=True)),
+                ('nas_name', models.CharField(help_text='NAS Name (or IP address)', max_length=128, unique=True, verbose_name='nas name')),
+                ('short_name', models.CharField(max_length=32, verbose_name='short name')),
+                ('type', models.CharField(max_length=30, verbose_name='type')),
+                ('secret', models.CharField(help_text='Shared Secret', max_length=60, verbose_name='secret')),
+                ('ports', models.IntegerField(blank=True, null=True, verbose_name='ports')),
+                ('community', models.CharField(blank=True, max_length=50, null=True, verbose_name='community')),
             ],
             options={
+                'verbose_name_plural': 'nas',
+                'verbose_name': 'nas',
                 'db_table': 'nas',
             },
         ),
@@ -34,88 +36,98 @@ class Migration(migrations.Migration):
                 ('rad_acct_id', models.BigIntegerField(primary_key=True, serialize=False)),
                 ('acct_session_id', models.CharField(max_length=32)),
                 ('acct_unique_id', models.CharField(max_length=32)),
-                ('user_name', models.CharField(max_length=64)),
-                ('realm', models.CharField(max_length=64, null=True)),
+                ('user_name', models.CharField(max_length=64, verbose_name='username')),
+                ('realm', models.CharField(max_length=64, null=True, verbose_name='realm')),
                 ('nas_ip_address', models.CharField(max_length=15)),
                 ('nas_port_id', models.CharField(max_length=15, null=True)),
-                ('nas_port_type', models.CharField(max_length=32)),
-                ('acct_start_time', models.DateTimeField()),
-                ('acct_stop_time', models.DateTimeField(null=True)),
-                ('acct_session_time', models.IntegerField(null=True)),
-                ('acct_authentic', models.CharField(max_length=32, null=True)),
-                ('connection_info_start', models.CharField(max_length=50, null=True)),
-                ('connection_info_stop', models.CharField(max_length=50, null=True)),
-                ('acct_input_octets', models.BigIntegerField(null=True)),
-                ('acct_output_octets', models.BigIntegerField(null=True)),
+                ('nas_port_type', models.CharField(max_length=32, verbose_name='nas port type')),
+                ('acct_start_time', models.DateTimeField(verbose_name='acct start time')),
+                ('acct_stop_time', models.DateTimeField(null=True, verbose_name='acct stop time')),
+                ('acct_session_time', models.IntegerField(null=True, verbose_name='acct session time')),
+                ('acct_authentic', models.CharField(max_length=32, null=True, verbose_name='acct authentic')),
+                ('connection_info_start', models.CharField(max_length=50, null=True, verbose_name='connection info start')),
+                ('connection_info_stop', models.CharField(max_length=50, null=True, verbose_name='connection info stop')),
+                ('acct_input_octets', models.BigIntegerField(null=True, verbose_name='acct input octets')),
+                ('acct_output_octets', models.BigIntegerField(null=True, verbose_name='acct output octets')),
                 ('callingStationId', models.CharField(max_length=50)),
                 ('calledStationId', models.CharField(max_length=50)),
-                ('acct_terminate_cause', models.CharField(max_length=32)),
-                ('service_type', models.CharField(max_length=32, null=True)),
-                ('framed_protocol', models.CharField(max_length=32, null=True)),
+                ('acct_terminate_cause', models.CharField(max_length=32, verbose_name='acct terminate cause')),
+                ('service_type', models.CharField(max_length=32, null=True, verbose_name='service type')),
+                ('framed_protocol', models.CharField(max_length=32, null=True, verbose_name='framed protocol')),
                 ('framed_ip_address', models.CharField(max_length=15)),
-                ('acct_start_delay', models.IntegerField(null=True)),
-                ('acct_stop_delay', models.IntegerField(null=True)),
-                ('xascend_session_svrkey', models.CharField(max_length=10, null=True)),
+                ('acct_start_delay', models.IntegerField(null=True, verbose_name='acct start delay')),
+                ('acct_stop_delay', models.IntegerField(null=True, verbose_name='acct stop delay')),
+                ('xascend_session_svrkey', models.CharField(max_length=10, null=True, verbose_name='xascend session svrkey')),
             ],
             options={
+                'verbose_name_plural': 'radiusaccounting',
+                'verbose_name': 'radiusaccounting',
                 'db_table': 'radiusaccounting',
             },
         ),
         migrations.CreateModel(
             name='RadiusChecks',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('user_name', models.CharField(max_length=64)),
-                ('value', models.CharField(max_length=40)),
-                ('op', models.CharField(max_length=2)),
-                ('attribute', models.CharField(max_length=64)),
+                ('user_name', models.CharField(max_length=64, verbose_name='username')),
+                ('value', models.CharField(max_length=40, verbose_name='radiusvalue')),
+                ('op', models.CharField(max_length=2, verbose_name='op')),
+                ('attribute', models.CharField(max_length=64, verbose_name='attribute')),
             ],
             options={
+                'verbose_name_plural': 'radiuschecks',
+                'verbose_name': 'radiuschecks',
                 'db_table': 'radiuschecks',
             },
         ),
         migrations.CreateModel(
             name='RadiusGroup',
             fields=[
                 ('id', models.UUIDField(primary_key=True, serialize=False)),
-                ('group_name', models.CharField(max_length=255, unique=True)),
-                ('priority', models.IntegerField(default=1)),
-                ('creation_date', models.DateField(null=True)),
-                ('modification_date', models.DateField(null=True)),
-                ('notes', models.CharField(blank=True, max_length=64)),
+                ('group_name', models.CharField(max_length=255, unique=True, verbose_name='groupname')),
+                ('priority', models.IntegerField(default=1, verbose_name='priority')),
+                ('creation_date', models.DateField(null=True, verbose_name='creation date')),
+                ('modification_date', models.DateField(null=True, verbose_name='modification date')),
+                ('notes', models.CharField(blank=True, max_length=64, verbose_name='notes')),
             ],
             options={
+                'verbose_name_plural': 'radiusgroups',
+                'verbose_name': 'radiusgroup',
                 'db_table': 'radiusgroup',
             },
         ),
         migrations.CreateModel(
             name='RadiusGroupUsers',
             fields=[
-                ('user_name', models.CharField(max_length=64, unique=True)),
+                ('user_name', models.CharField(max_length=64, unique=True, verbose_name='username')),
                 ('id', models.UUIDField(primary_key=True, serialize=False)),
-                ('group_name', models.CharField(max_length=255, unique=True)),
-                ('radius_checks', models.ManyToManyField(blank=True, to='django_freeradius.RadiusChecks')),
+                ('group_name', models.CharField(max_length=255, unique=True, verbose_name='groupname')),
+                ('radius_checks', models.ManyToManyField(blank=True, to='django_freeradius.RadiusChecks', verbose_name='radius checks')),
             ],
             options={
+                'verbose_name_plural': 'radiusgroupusers',
+                'verbose_name': 'radiusgroupusers',
                 'db_table': 'radiusgroupusers',
             },
         ),
         migrations.CreateModel(
             name='RadiusReplies',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('user_name', models.CharField(max_length=64)),
-                ('value', models.CharField(max_length=40)),
-                ('op', models.CharField(max_length=2)),
-                ('attribute', models.CharField(max_length=64)),
+                ('user_name', models.CharField(max_length=64, verbose_name='username')),
+                ('value', models.CharField(max_length=40, verbose_name='value')),
+                ('op', models.CharField(max_length=2, verbose_name='op')),
+                ('attribute', models.CharField(max_length=64, verbose_name='attribute')),
             ],
             options={
+                'verbose_name_plural': 'radiusreplies',
+                'verbose_name': 'radiusreplies',
                 'db_table': 'radiusreplies',
             },
         ),
         migrations.AddField(
             model_name='radiusgroupusers',
             name='radius_replies',
-            field=models.ManyToManyField(blank=True, to='django_freeradius.RadiusReplies'),
+            field=models.ManyToManyField(blank=True, to='django_freeradius.RadiusReplies', verbose_name='radius replies'),
         ),
     ]
diff --git a/django_freeradius/models.py b/django_freeradius/models.py
@@ -1,59 +1,67 @@
 from django.db import models
-
+from django.utils.translation import ugettext_lazy as _
 
 # Create your models here.
 
 
 class RadiusGroup(models.Model):
     id = models.UUIDField(primary_key=True)
-    group_name = models.CharField(max_length=255, unique=True)
-    priority = models.IntegerField(default=1)
-    creation_date = models.DateField(null=True)
-    modification_date = models.DateField(null=True)
-    notes = models.CharField(max_length=64, blank=True)
+    group_name = models.CharField(verbose_name=_('groupname'), max_length=255, unique=True)
+    priority = models.IntegerField(verbose_name=_('priority'), default=1)
+    creation_date = models.DateField(verbose_name=_('creation date'), null=True)
+    modification_date = models.DateField(verbose_name=_('modification date'), null=True)
+    notes = models.CharField(verbose_name=_('notes'), max_length=64, blank=True)
 
     def __str__(self):
         return self.group_name
 
     class Meta:
         db_table = 'radiusgroup'
+        verbose_name = _("radiusgroup")
+        verbose_name_plural = _("radiusgroups")
 
 
 class RadiusGroupUsers(models.Model):
-    user_name = models.CharField(max_length=64, unique=True)
+    user_name = models.CharField(verbose_name=_('username'), max_length=64, unique=True)
     id = models.UUIDField(primary_key=True)
-    group_name = models.CharField(max_length=255, unique=True)
-    radius_replies = models.ManyToManyField('RadiusReplies', blank=True)
-    radius_checks = models.ManyToManyField('RadiusChecks', blank=True)
+    group_name = models.CharField(verbose_name=_('groupname'), max_length=255, unique=True)
+    radius_replies = models.ManyToManyField('RadiusReplies', verbose_name=_('radius replies'), blank=True)
+    radius_checks = models.ManyToManyField('RadiusChecks', verbose_name=_('radius checks'), blank=True)
 
     class Meta:
         db_table = 'radiusgroupusers'
+        verbose_name = _("radiusgroupusers")
+        verbose_name_plural = _("radiusgroupusers")
 
     def __str__(self):
         return self.user_name
 
 
 class RadiusReplies(models.Model):
-    user_name = models.CharField(max_length=64)
-    value = models.CharField(max_length=40)
-    op = models.CharField(max_length=2)
-    attribute = models.CharField(max_length=64)
+    user_name = models.CharField(verbose_name=_('username'), max_length=64)
+    value = models.CharField(verbose_name=_('value'), max_length=40)
+    op = models.CharField(verbose_name=_('op'), max_length=2)
+    attribute = models.CharField(verbose_name=_('attribute'), max_length=64)
 
     class Meta:
         db_table = 'radiusreplies'
+        verbose_name = _("radiusreplies")
+        verbose_name_plural = _("radiusreplies")
 
     def __str__(self):
         return self.user_name
 
 
 class RadiusChecks(models.Model):
-    user_name = models.CharField(max_length=64)
-    value = models.CharField(max_length=40)
-    op = models.CharField(max_length=2)
-    attribute = models.CharField(max_length=64)
+    user_name = models.CharField(verbose_name=_('username'), max_length=64)
+    value = models.CharField(verbose_name=_('radiusvalue'), max_length=40)
+    op = models.CharField(verbose_name=_('op'), max_length=2)
+    attribute = models.CharField(verbose_name=_('attribute'), max_length=64)
 
     class Meta:
         db_table = 'radiuschecks'
+        verbose_name = _("radiuschecks")
+        verbose_name_plural = _("radiuschecks")
 
     def __str__(self):
         return self.user_name
@@ -63,46 +71,53 @@ class RadiusAccounting(models.Model):
     rad_acct_id = models.BigIntegerField(primary_key=True)
     acct_session_id = models.CharField(max_length=32)
     acct_unique_id = models.CharField(max_length=32)
-    user_name = models.CharField(max_length=64)
-    realm = models.CharField(max_length=64, null=True)
+    user_name = models.CharField(verbose_name=_('username'), max_length=64)
+    realm = models.CharField(verbose_name=_('realm'), max_length=64, null=True)
     nas_ip_address = models.CharField(max_length=15)
     nas_port_id = models.CharField(max_length=15, null=True)
-    nas_port_type = models.CharField(max_length=32)
-    acct_start_time = models.DateTimeField()
-    acct_stop_time = models.DateTimeField(null=True)
-    acct_session_time = models.IntegerField(null=True)
-    acct_authentic = models.CharField(max_length=32, null=True)
-    connection_info_start = models.CharField(max_length=50, null=True)
-    connection_info_stop = models.CharField(max_length=50, null=True)
-    acct_input_octets = models.BigIntegerField(null=True)
-    acct_output_octets = models.BigIntegerField(null=True)
+    nas_port_type = models.CharField(verbose_name=_('nas port type'), max_length=32)
+    acct_start_time = models.DateTimeField(verbose_name=_('acct start time'))
+    acct_stop_time = models.DateTimeField(verbose_name=_('acct stop time'), null=True)
+    acct_session_time = models.IntegerField(verbose_name=_('acct session time'), null=True)
+    acct_authentic = models.CharField(verbose_name=_('acct authentic'), max_length=32, null=True)
+    connection_info_start = models.CharField(
+            verbose_name=_('connection info start'), max_length=50, null=True)
+    connection_info_stop = models.CharField(verbose_name=_('connection info stop'), max_length=50, null=True)
+    acct_input_octets = models.BigIntegerField(verbose_name=_('acct input octets'), null=True)
+    acct_output_octets = models.BigIntegerField(verbose_name=_('acct output octets'), null=True)
     callingStationId = models.CharField(max_length=50)
     calledStationId = models.CharField(max_length=50)
-    acct_terminate_cause = models.CharField(max_length=32)
-    service_type = models.CharField(max_length=32, null=True)
-    framed_protocol = models.CharField(max_length=32, null=True)
+    acct_terminate_cause = models.CharField(verbose_name=_('acct terminate cause'), max_length=32)
+    service_type = models.CharField(verbose_name=_('service type'), max_length=32, null=True)
+    framed_protocol = models.CharField(verbose_name=_('framed protocol'), max_length=32, null=True)
     framed_ip_address = models.CharField(max_length=15)
-    acct_start_delay = models.IntegerField(null=True)
-    acct_stop_delay = models.IntegerField(null=True)
-    xascend_session_svrkey = models.CharField(max_length=10, null=True)
+    acct_start_delay = models.IntegerField(verbose_name=_('acct start delay'), null=True)
+    acct_stop_delay = models.IntegerField(verbose_name=_('acct stop delay'), null=True)
+    xascend_session_svrkey = models.CharField(
+            verbose_name=_('xascend session svrkey'), max_length=10, null=True)
 
     class Meta:
         db_table = 'radiusaccounting'
+        verbose_name = _("radiusaccounting")
+        verbose_name_plural = _("radiusaccounting")
 
     def __str__(self):
         return self.acct_unique_id
 
 
 class Nas(models.Model):
-    nas_name = models.CharField(max_length=128, unique=True, help_text='NAS Name (or IP address)')
-    short_name = models.CharField(max_length=32)
-    type = models.CharField(max_length=30)
-    secret = models.CharField(max_length=60, help_text='Shared Secret')
-    ports = models.IntegerField(blank=True, null=True)
-    community = models.CharField(max_length=50, blank=True, null=True)
+    nas_name = models.CharField(
+            verbose_name=_('nas name'), max_length=128, unique=True, help_text=_('NAS Name (or IP address)'))
+    short_name = models.CharField(verbose_name=_('short name'), max_length=32)
+    type = models.CharField(verbose_name=_('type'), max_length=30)
+    secret = models.CharField(verbose_name=_('secret'), max_length=60, help_text=_('Shared Secret'))
+    ports = models.IntegerField(verbose_name=_('ports'), blank=True, null=True)
+    community = models.CharField(verbose_name=_('community'), max_length=50, blank=True, null=True)
 
     class Meta:
         db_table = 'nas'
+        verbose_name = _("nas")
+        verbose_name_plural = _("nas")
 
     def __str__(self):
         return self.nas_name