Skip to content

Commit 2b59f7d

Browse files
committed
update
1 parent fed2897 commit 2b59f7d

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

adminlteui/migrations/0003_menu.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
# Generated by Django 2.2.3 on 2019-07-04 09:17
1+
# Generated by Django 2.2.3 on 2019-07-06 02:37
22

33
from django.db import migrations, models
4+
import django.db.models.deletion
45

56

67
class Migration(migrations.Migration):
78

89
dependencies = [
9-
('auth', '0011_update_proxy_permissions'),
10+
('contenttypes', '0002_remove_content_type_name'),
1011
('django_admin_settings', '0002_options_valid'),
1112
]
1213

@@ -20,14 +21,16 @@ class Migration(migrations.Migration):
2021
('numchild', models.PositiveIntegerField(default=0)),
2122
('name', models.CharField(max_length=255, verbose_name='name')),
2223
('position', models.CharField(default='left', max_length=255, verbose_name='Menu Position')),
24+
('link_type', models.IntegerField(choices=[(0, 'Internal'), (1, 'External')], default=0, verbose_name='Link Type')),
2325
('link', models.CharField(blank=True, max_length=255, null=True, verbose_name='Link')),
2426
('icon', models.CharField(blank=True, max_length=255, null=True, verbose_name='Icon')),
2527
('valid', models.BooleanField(default=True, verbose_name='Valid')),
26-
('permission', models.ManyToManyField(blank=True, to='auth.Permission', verbose_name='Permission')),
27-
('permission_group', models.ManyToManyField(blank=True, to='auth.Group', verbose_name='Permission Group')),
28+
('content_type', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='ContentType')),
2829
],
2930
options={
3031
'abstract': False,
32+
'verbose_name': 'Menu',
33+
'verbose_name_plural': 'Menu Setting',
3134
},
3235
),
3336
]

adminlteui/models.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from django.db import models
33
from django.utils import timezone
44
from django.utils.translation import gettext_lazy as _
5-
from django.contrib.auth.models import Permission, Group
5+
from django.contrib.contenttypes.models import ContentType
66

77
from treebeard.mp_tree import MP_Node
88

@@ -27,24 +27,31 @@ class Meta:
2727

2828

2929
class Menu(MP_Node):
30+
LINK_TYPE = (
31+
(0, _('Internal')),
32+
(1, _('External')),
33+
)
3034
name = models.CharField(max_length=255, verbose_name=_('name'))
3135
position = models.CharField(
3236
max_length=255, default='left', verbose_name=_('Menu Position'))
37+
link_type = models.IntegerField(default=0, choices=LINK_TYPE,
38+
verbose_name=_('Link Type'))
3339
link = models.CharField(max_length=255, blank=True, null=True,
3440
verbose_name=_('Link'))
3541
icon = models.CharField(max_length=255,
3642
blank=True,
3743
null=True,
3844
verbose_name=_('Icon'))
39-
permission = models.ManyToManyField(Permission, blank=True,
40-
verbose_name=_('Permission'))
41-
42-
permission_group = models.ManyToManyField(Group, blank=True,
43-
verbose_name=_(
44-
'Permission Group'))
45+
content_type = models.ForeignKey(ContentType, blank=True,
46+
verbose_name=_('ContentType'),
47+
on_delete=models.CASCADE)
4548

4649
valid = models.BooleanField(default=True, verbose_name=_('Valid'))
4750
node_order_by = ['name', 'position']
4851

4952
def __str__(self):
5053
return '{}'.format(self.name)
54+
55+
class Meta:
56+
verbose_name = _('Menu')
57+
verbose_name_plural = _('Menu Setting')

0 commit comments

Comments
 (0)