diff --git a/apps/assets/forms.py b/apps/assets/forms.py index 6fc50849e..1338a7449 100644 --- a/apps/assets/forms.py +++ b/apps/assets/forms.py @@ -22,9 +22,11 @@ class AssetForm(forms.ModelForm): class AssetGroupForm(forms.ModelForm): assets = forms.ModelMultipleChoiceField(queryset=Asset.objects.all(), - widget=forms.SelectMultiple(attrs={ - 'class': 'select2', - 'data-placeholder': _('Select assets')})) + label=_('Asset'), + required=False, + widget=forms.SelectMultiple( + attrs={'class': 'select2', 'data-placeholder': _('Select assets')}) + ) def __init__(self, *args, **kwargs): if kwargs.get('instance'): diff --git a/apps/assets/migrations/0001_initial.py b/apps/assets/migrations/0001_initial.py index dc20ec9f1..e2ae4c8a1 100644 --- a/apps/assets/migrations/0001_initial.py +++ b/apps/assets/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-03 14:30 +# Generated by Django 1.10 on 2016-09-05 12:50 from __future__ import unicode_literals from django.db import migrations, models @@ -14,31 +14,50 @@ class Migration(migrations.Migration): ] operations = [ + migrations.CreateModel( + name='AdminUser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(blank=True, max_length=128, null=True, unique=True, verbose_name='Name')), + ('username', models.CharField(blank=True, max_length=16, null=True, verbose_name='Username')), + ('password', models.CharField(blank=True, max_length=256, null=True, verbose_name='Password')), + ('private_key', models.CharField(blank=True, max_length=4096, null=True, verbose_name='SSH private key')), + ('is_default', models.BooleanField(default=True, verbose_name='As default')), + ('auto_update', models.BooleanField(default=True, verbose_name='Auto update pass/key')), + ('date_added', models.DateTimeField(auto_now=True, null=True)), + ('create_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')), + ('comment', models.TextField(blank=True, verbose_name='Comment')), + ], + options={ + 'db_table': 'adminuser', + }, + ), migrations.CreateModel( name='Asset', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ip', models.CharField(blank=True, max_length=32, verbose_name='\u8d44\u4ea7IP')), - ('other_ip', models.CharField(blank=True, max_length=255, verbose_name='\u5176\u4ed6IP')), - ('remote_card_ip', models.CharField(blank=True, max_length=16, verbose_name='\u8fdc\u63a7\u5361IP')), - ('hostname', models.CharField(blank=True, max_length=128, unique=True, verbose_name='\u4e3b\u673a\u540d')), - ('port', models.IntegerField(blank=True, verbose_name='\u7aef\u53e3')), - ('username', models.CharField(blank=True, max_length=16, verbose_name='\u7ba1\u7406\u7528\u6237\u540d')), - ('password', models.CharField(blank=True, max_length=256, verbose_name='\u5bc6\u7801')), - ('mac_addr', models.CharField(blank=True, max_length=20, unique=True, verbose_name='MAC\u5730\u5740')), - ('brand', models.CharField(blank=True, max_length=64, verbose_name='\u786c\u4ef6\u5382\u5546\u578b\u53f7')), - ('cpu', models.CharField(blank=True, max_length=64, verbose_name='CPU')), - ('memory', models.CharField(blank=True, max_length=128, verbose_name='\u5185\u5b58')), - ('disk', models.CharField(blank=True, max_length=1024, verbose_name='\u786c\u76d8')), - ('os', models.CharField(blank=True, max_length=128, verbose_name='\u7cfb\u7edf\u4fe1\u606f')), - ('cabinet_no', models.CharField(blank=True, max_length=32, verbose_name='\u673a\u67dc\u53f7')), - ('cabinet_pos', models.IntegerField(blank=True, null=True, verbose_name='\u8d44\u4ea7\u4f4d\u7f6e')), - ('number', models.CharField(blank=True, max_length=32, unique=True, verbose_name='\u8d44\u4ea7\u7f16\u53f7')), - ('sn', models.CharField(blank=True, max_length=128, unique=True, verbose_name='SN\u7f16\u53f7')), - ('created_by', models.CharField(blank=True, max_length=32, verbose_name='\u521b\u5efa\u8005')), - ('is_active', models.BooleanField(default=True, verbose_name='\u662f\u5426\u6fc0\u6d3b')), - ('date_added', models.DateTimeField(auto_now=True, null=True)), - ('comment', models.CharField(blank=True, max_length=128, verbose_name='\u5907\u6ce8')), + ('ip', models.CharField(blank=True, max_length=32, null=True, verbose_name='IP')), + ('other_ip', models.CharField(blank=True, max_length=255, null=True, verbose_name='Other IP')), + ('remote_card_ip', models.CharField(blank=True, max_length=16, null=True, verbose_name='Remote card IP')), + ('hostname', models.CharField(blank=True, max_length=128, null=True, unique=True, verbose_name='Hostname')), + ('port', models.IntegerField(blank=True, null=True, verbose_name='Port')), + ('username', models.CharField(blank=True, max_length=16, null=True, verbose_name='Admin user')), + ('password', models.CharField(blank=True, max_length=256, null=True, verbose_name='Admin password')), + ('mac_addr', models.CharField(blank=True, max_length=20, null=True, verbose_name='Mac address')), + ('brand', models.CharField(blank=True, max_length=64, null=True, verbose_name='Brand')), + ('cpu', models.CharField(blank=True, max_length=64, null=True, verbose_name='CPU')), + ('memory', models.CharField(blank=True, max_length=128, null=True, verbose_name='Memory')), + ('disk', models.CharField(blank=True, max_length=1024, null=True, verbose_name='Disk')), + ('os', models.CharField(blank=True, max_length=128, null=True, verbose_name='OS')), + ('cabinet_no', models.CharField(blank=True, max_length=32, null=True, verbose_name='Cabinet number')), + ('cabinet_pos', models.IntegerField(blank=True, null=True, verbose_name='Cabinet position')), + ('number', models.CharField(blank=True, max_length=32, null=True, unique=True, verbose_name='Asset number')), + ('sn', models.CharField(blank=True, max_length=128, null=True, unique=True, verbose_name='Serial number')), + ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')), + ('is_active', models.BooleanField(default=True, verbose_name='Is active')), + ('date_added', models.DateTimeField(auto_now=True, null=True, verbose_name='Date added')), + ('comment', models.CharField(blank=True, max_length=128, null=True, verbose_name='Comment')), + ('admin_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='assets.AdminUser', verbose_name='Admin user')), ], options={ 'db_table': 'asset', @@ -48,15 +67,23 @@ class Migration(migrations.Migration): name='AssetExtend', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('key', models.CharField(blank=True, max_length=64, null=True, verbose_name='KEY')), + ('value', models.CharField(blank=True, max_length=64, null=True, verbose_name='VALUE')), + ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')), + ('date_added', models.DateTimeField(auto_now=True, null=True)), + ('comment', models.TextField(blank=True, verbose_name='Comment')), ], + options={ + 'db_table': 'assetextend', + }, ), migrations.CreateModel( name='AssetGroup', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=64, unique=True)), - ('created_by', models.CharField(blank=True, max_length=32, verbose_name='\u521b\u5efa\u8005')), - ('comment', models.CharField(blank=True, max_length=128, null=True)), + ('name', models.CharField(blank=True, max_length=64, null=True, unique=True, verbose_name='Name')), + ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')), + ('comment', models.TextField(blank=True, verbose_name='Comment')), ], options={ 'db_table': 'assetgroup', @@ -66,46 +93,93 @@ class Migration(migrations.Migration): name='IDC', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=32, verbose_name='\u673a\u623f\u540d\u79f0')), - ('bandwidth', models.CharField(blank=True, max_length=32, verbose_name='\u673a\u623f\u5e26\u5bbd')), - ('contact', models.CharField(blank=True, max_length=16, verbose_name='\u8054\u7cfb\u4eba')), - ('phone', models.CharField(blank=True, max_length=32, verbose_name='\u8054\u7cfb\u7535\u8bdd')), - ('address', models.CharField(blank=True, max_length=128, verbose_name='\u673a\u623f\u5730\u5740')), - ('network', models.TextField(blank=True, verbose_name='IP\u5730\u5740\u6bb5')), - ('date_added', models.DateField(auto_now=True, null=True)), - ('operator', models.CharField(blank=True, max_length=32, verbose_name='\u8fd0\u8425\u5546')), - ('created_by', models.CharField(blank=True, max_length=32, verbose_name='\u521b\u5efa\u8005')), - ('comment', models.CharField(blank=True, max_length=128, verbose_name='\u5907\u6ce8')), + ('name', models.CharField(max_length=32, verbose_name='Name')), + ('bandwidth', models.CharField(blank=True, max_length=32, verbose_name='Bandwidth')), + ('contact', models.CharField(blank=True, max_length=16, verbose_name='Contact')), + ('phone', models.CharField(blank=True, max_length=32, verbose_name='Phone')), + ('address', models.CharField(blank=True, max_length=128, verbose_name='Address')), + ('network', models.TextField(blank=True, verbose_name='Network')), + ('date_added', models.DateField(auto_now=True, null=True, verbose_name='Date added')), + ('operator', models.CharField(blank=True, max_length=32, verbose_name='Operator')), + ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')), + ('comment', models.TextField(blank=True, verbose_name='Comment')), ], options={ 'db_table': 'idc', - 'verbose_name': 'IDC\u673a\u623f', - 'verbose_name_plural': 'IDC\u673a\u623f', + }, + ), + migrations.CreateModel( + name='Label', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('key', models.CharField(blank=True, max_length=64, null=True, verbose_name='KEY')), + ('value', models.CharField(blank=True, max_length=64, null=True, verbose_name='VALUE')), + ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')), + ('date_added', models.DateTimeField(auto_now=True, null=True)), + ('comment', models.CharField(blank=True, max_length=128, verbose_name='Comment')), + ('asset', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='assets.Asset', verbose_name='Asset')), + ], + options={ + 'db_table': 'label', + }, + ), + migrations.CreateModel( + name='SysUser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')), + ('username', models.CharField(blank=True, max_length=16, verbose_name='Username')), + ('password', models.CharField(blank=True, max_length=256, verbose_name='Password')), + ('protocol', models.CharField(default='ssh', max_length=16, verbose_name='Protocol')), + ('private_key', models.CharField(blank=True, max_length=4096, verbose_name='SSH private key')), + ('public_key', models.CharField(blank=True, max_length=4096, verbose_name='SSH public key')), + ('is_default', models.BooleanField(default=True, verbose_name='As default')), + ('auto_push', models.BooleanField(default=True, verbose_name='Auto push')), + ('auto_update', models.BooleanField(default=True, verbose_name='Auto update pass/key')), + ('sudo', models.TextField(blank=True, max_length=4096, verbose_name='Sudo')), + ('shell', models.CharField(blank=True, max_length=64, verbose_name='Shell')), + ('home', models.CharField(blank=True, max_length=64, verbose_name='Home')), + ('uid', models.IntegerField(blank=True, verbose_name='Uid')), + ('date_added', models.DateTimeField(auto_now=True, null=True)), + ('create_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')), + ('comment', models.CharField(blank=True, max_length=128, verbose_name='Comment')), + ], + options={ + 'db_table': 'sysuser', }, ), migrations.AddField( model_name='asset', name='env', - field=models.ManyToManyField(blank=True, related_name='asset_env_extend', to='assets.AssetExtend', verbose_name='\u6240\u5c5e\u4e3b\u673a\u7ec4\u73af\u5883'), + field=models.ManyToManyField(related_name='asset_env_extend', to='assets.AssetExtend', verbose_name='Asset environment'), ), migrations.AddField( model_name='asset', - name='group', - field=models.ManyToManyField(blank=True, to='assets.AssetGroup', verbose_name='\u6240\u5c5e\u4e3b\u673a\u7ec4'), + name='groups', + field=models.ManyToManyField(blank=True, null=True, to='assets.AssetGroup', verbose_name='Asset groups'), ), migrations.AddField( model_name='asset', name='idc', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='assets.IDC', verbose_name='\u673a\u623f'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='assets.IDC', verbose_name='IDC'), ), migrations.AddField( model_name='asset', name='status', - field=models.ManyToManyField(blank=True, related_name='asset_status_extend', to='assets.AssetExtend', verbose_name='\u8d44\u4ea7\u72b6\u6001'), + field=models.ManyToManyField(related_name='asset_status_extend', to='assets.AssetExtend', verbose_name='Asset status'), + ), + migrations.AddField( + model_name='asset', + name='sys_user', + field=models.ManyToManyField(blank=True, null=True, to='assets.SysUser', verbose_name='System User'), ), migrations.AddField( model_name='asset', name='type', - field=models.ManyToManyField(blank=True, related_name='asset_type_extend', to='assets.AssetExtend', verbose_name='\u8d44\u4ea7\u7c7b\u578b'), + field=models.ManyToManyField(related_name='asset_type_extend', to='assets.AssetExtend', verbose_name='Asset type'), + ), + migrations.AlterIndexTogether( + name='asset', + index_together=set([('ip', 'port')]), ), ] diff --git a/apps/assets/migrations/0002_auto_20160821_1757.py b/apps/assets/migrations/0002_auto_20160821_1757.py deleted file mode 100644 index e22966fd8..000000000 --- a/apps/assets/migrations/0002_auto_20160821_1757.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-21 09:57 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='asset', - name='cabinet_pos', - field=models.IntegerField(blank=True, max_length=4, verbose_name='\u673a\u5668\u4f4d\u7f6e'), - ), - ] diff --git a/apps/assets/migrations/0003_auto_20160821_1759.py b/apps/assets/migrations/0003_auto_20160821_1759.py deleted file mode 100644 index e5c49bcd5..000000000 --- a/apps/assets/migrations/0003_auto_20160821_1759.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-21 09:59 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('assets', '0002_auto_20160821_1757'), - ] - - operations = [ - migrations.AlterField( - model_name='asset', - name='cabinet_pos', - field=models.IntegerField(blank=True, max_length=4, null=True, verbose_name='\u673a\u5668\u4f4d\u7f6e'), - ), - ] diff --git a/apps/assets/models.py b/apps/assets/models.py index f29c2a5f2..7f4a4c579 100644 --- a/apps/assets/models.py +++ b/apps/assets/models.py @@ -14,7 +14,7 @@ class AssetGroup(models.Model): return self.name class Meta: - db_table = 'assetgroup' + db_table = 'asset_group' class IDC(models.Model): diff --git a/apps/assets/templates/assets/asset_add.html b/apps/assets/templates/assets/asset_create.html similarity index 100% rename from apps/assets/templates/assets/asset_add.html rename to apps/assets/templates/assets/asset_create.html diff --git a/apps/assets/templates/assets/assetgroup_add.html b/apps/assets/templates/assets/asset_group_create.html similarity index 100% rename from apps/assets/templates/assets/assetgroup_add.html rename to apps/assets/templates/assets/asset_group_create.html diff --git a/apps/assets/templates/assets/assetgroup_list.html b/apps/assets/templates/assets/asset_group_list.html similarity index 60% rename from apps/assets/templates/assets/assetgroup_list.html rename to apps/assets/templates/assets/asset_group_list.html index bc21bc8d5..484c131f4 100644 --- a/apps/assets/templates/assets/assetgroup_list.html +++ b/apps/assets/templates/assets/asset_group_list.html @@ -2,35 +2,35 @@ {% load i18n %} {% load common_tags %} {% block content_left_head %} - {% trans "Create asset group" %} + {% trans "Create asset group" %} {% endblock %} {% block table_head %} - {% trans 'Name' %} + {% trans 'Name' %} {% trans 'Asset num' %} - {% trans 'Comment' %} + {% trans 'Comment' %} {% endblock %} {% block table_body %} - {% for assetgroup in assetgroups %} + {% for asset_group in asset_group_list %} - + - - {{ assetgroup.name }} + + {{ asset_group.name }} - {{ assetgroup.assets.count }} - {{ assetgroup.comment }} + {{ asset_group.assets.count }} + {{ asset_group.comment }} - {% trans 'Edit' %} - {% trans 'Delete' %} + {% trans 'Edit' %} + {% trans 'Delete' %} {% endfor %} @@ -55,5 +55,3 @@ {% endblock %} - - diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 61a56a406..4895f454c 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -1,4 +1,5 @@ {% extends 'base.html' %} +{% load i18n %} {% block content %}
@@ -23,7 +24,7 @@
- 添加资产 + {% trans 'Create asset' %}
diff --git a/apps/assets/urls.py b/apps/assets/urls.py index 800381252..68279389a 100644 --- a/apps/assets/urls.py +++ b/apps/assets/urls.py @@ -14,14 +14,14 @@ app_name = 'assets' urlpatterns = [ url(r'^$', views.AssetListView.as_view(), name='asset-index'), url(r'^asset$', views.AssetListView.as_view(), name='asset-list'), - url(r'^asset/add$', views.AssetAddView.as_view(), name='asset-add'), + url(r'^asset/create$', views.AssetCreateView.as_view(), name='asset-create'), url(r'^asset/(?P[0-9]+)$', views.AssetDetailView.as_view(), name='asset-detail'), - url(r'^asset/(?P[0-9]+)$/edit', views.AssetEditView.as_view(), name='asset-edit'), + url(r'^asset/(?P[0-9]+)$/update', views.AssetUpdateView.as_view(), name='asset-update'), url(r'^asset/(?P[0-9]+)/delete$', views.AssetDeleteView.as_view(), name='asset-delete'), - url(r'^assetgroup$', views.AssetGroupListView.as_view(), name='assetgroup-list'), - url(r'^assetgroup/add$', views.AssetGroupAddView.as_view(), name='assetgroup-add'), - url(r'^assetgroup/(?P[0-9]+)$', views.AssetGroupDetailView.as_view(), name='assetgroup-detail'), - url(r'^assetgroup/(?P[0-9]+)/edit$', views.AssetGroupEditView.as_view(), name='assetgroup-edit'), - url(r'^assetgroup/(?P[0-9]+)/delete$', views.AssetGroupDeleteView.as_view(), name='assetgroup-delete'), + url(r'^asset-group$', views.AssetGroupListView.as_view(), name='asset-group-list'), + url(r'^asset-group/create$', views.AssetGroupCreateView.as_view(), name='asset-group-create'), + url(r'^asset-group/(?P[0-9]+)$', views.AssetGroupDetailView.as_view(), name='asset-group-detail'), + url(r'^asset-group/(?P[0-9]+)/update$', views.AssetGroupUpdateView.as_view(), name='asset-group-update'), + url(r'^asset-group/(?P[0-9]+)/delete$', views.AssetGroupDeleteView.as_view(), name='asset-group-delete'), # url(r'^api/v1.0/', include(router.urls)), ] diff --git a/apps/assets/views.py b/apps/assets/views.py index 9f2150956..efe698f13 100644 --- a/apps/assets/views.py +++ b/apps/assets/views.py @@ -16,18 +16,18 @@ from .forms import AssetForm, AssetGroupForm from .utils import AdminUserRequiredMixin -class AssetAddView(CreateView): +class AssetCreateView(CreateView): model = Asset form_class = AssetForm - template_name = 'assets/asset_add.html' + template_name = 'assets/asset_create.html' success_url = reverse_lazy('assets:asset-list') def form_invalid(self, form): print(form.errors) - return super(AssetAddView, self).form_invalid(form) + return super(AssetCreateView, self).form_invalid(form) -class AssetEditView(UpdateView): +class AssetUpdateView(UpdateView): pass @@ -48,11 +48,11 @@ class AssetDetailView(DetailView): template_name = 'assets/asset_detail.html' -class AssetGroupAddView(CreateView): +class AssetGroupCreateView(CreateView): model = AssetGroup form_class = AssetGroupForm - template_name = 'assets/assetgroup_add.html' - success_url = reverse_lazy('assets:assetgroup-list') + template_name = 'assets/asset_group_create.html' + success_url = reverse_lazy('assets:asset-group-list') def get_context_data(self, **kwargs): context = { @@ -61,13 +61,17 @@ class AssetGroupAddView(CreateView): 'assets': Asset.objects.all(), } kwargs.update(context) - return super(AssetGroupAddView, self).get_context_data(**kwargs) + return super(AssetGroupCreateView, self).get_context_data(**kwargs) + + def form_valid(self, form): + print(form.data) + return super(AssetGroupCreateView, self).form_valid(form) class AssetGroupListView(ListView): model = AssetGroup - context_object_name = 'assetgroups' - template_name = 'assets/assetgroup_list.html' + context_object_name = 'asset_group_list' + template_name = 'assets/asset_group_list.html' def get_context_data(self, **kwargs): context = { @@ -82,11 +86,11 @@ class AssetGroupDetailView(DetailView): pass -class AssetGroupEditView(UpdateView): +class AssetGroupUpdateView(UpdateView): model = AssetGroup form_class = AssetGroupForm - template_name = 'assets/assetgroup_add.html' - success_url = reverse_lazy('assets:assetgroup-list') + template_name = 'assets/asset_group_create.html' + success_url = reverse_lazy('assets:asset-group-list') def get_context_data(self, **kwargs): context = { @@ -95,7 +99,7 @@ class AssetGroupEditView(UpdateView): 'assets': Asset.objects.all(), } kwargs.update(context) - return super(AssetGroupEditView, self).get_context_data(**kwargs) + return super(AssetGroupUpdateView, self).get_context_data(**kwargs) class AssetGroupDeleteView(DeleteView): diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html index 2c3169361..1ad37fead 100644 --- a/apps/templates/_nav.html +++ b/apps/templates/_nav.html @@ -10,7 +10,7 @@
  • @@ -19,7 +19,7 @@
    • {% trans 'Asset' %}
      • -
    • {% trans 'Asset group' %}
      • +
    • {% trans 'Asset group' %}
    • {% trans 'IDC' %}
    • {% trans 'Admin user' %}
    • {% trans 'System user' %}
      • diff --git a/apps/templates/_user_profile.html b/apps/templates/_user_profile.html index 13d272d90..5f61faf90 100644 --- a/apps/templates/_user_profile.html +++ b/apps/templates/_user_profile.html @@ -11,7 +11,7 @@ {{ request.user.name }} - {{ request.user.get_role_display | default:"{% trans 'User' %}" }} + {{ request.user.get_role_display | default:_('User') }} diff --git a/apps/users/forms.py b/apps/users/forms.py index e388fa400..7f90f0f5e 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -14,7 +14,7 @@ class UserLoginForm(forms.Form): captcha = CaptchaField() -class UserAddForm(ModelForm): +class UserCreateForm(ModelForm): class Meta: model = User fields = [ diff --git a/apps/users/models.py b/apps/users/models.py index 92414c2b2..c6fe74c91 100644 --- a/apps/users/models.py +++ b/apps/users/models.py @@ -66,7 +66,7 @@ class UserGroup(models.Model): return self.name class Meta: - db_table = 'usergroup' + db_table = 'user-group' @classmethod def initial(cls): diff --git a/apps/users/serializers.py b/apps/users/serializers.py index dfff7621d..d61842415 100644 --- a/apps/users/serializers.py +++ b/apps/users/serializers.py @@ -7,7 +7,7 @@ from .models import User, UserGroup class UserSerializer(serializers.ModelSerializer): - groups = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='users:usergroup-detail-api') + groups = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='users:user-group-detail-api') class Meta: model = User diff --git a/apps/users/templates/users/user_add.html b/apps/users/templates/users/user_create.html similarity index 100% rename from apps/users/templates/users/user_add.html rename to apps/users/templates/users/user_create.html diff --git a/apps/users/templates/users/usergroup_add.html b/apps/users/templates/users/user_group_create.html similarity index 100% rename from apps/users/templates/users/usergroup_add.html rename to apps/users/templates/users/user_group_create.html diff --git a/apps/users/templates/users/usergroup_list.html b/apps/users/templates/users/user_group_list.html similarity index 66% rename from apps/users/templates/users/usergroup_list.html rename to apps/users/templates/users/user_group_list.html index 2e5522b3c..851291880 100644 --- a/apps/users/templates/users/usergroup_list.html +++ b/apps/users/templates/users/user_group_list.html @@ -2,14 +2,14 @@ {% load i18n %} {% load common_tags %} {% block content_left_head %} - 添加用户组 + 添加用户组 {% endblock %} {% block table_head %} - 名称 + 名称 用户数量 资产数量 描述 @@ -17,22 +17,22 @@ {% endblock %} {% block table_body %} - {% for usergroup in usergroup_list %} + {% for user_group in user_group_list %} - + - - {{ usergroup.name }} + + {{ user_group.name }} - {{ usergroup.users.all|length }} + {{ user_group.users.all|length }} 数量 - {{ usergroup.comment|truncatewords:8 }} + {{ user_group.comment|truncatewords:8 }} - 编辑 - 删除 + 编辑 + 删除 {% endfor %} diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html index 51fbfa57b..3980bba17 100644 --- a/apps/users/templates/users/user_list.html +++ b/apps/users/templates/users/user_list.html @@ -2,7 +2,7 @@ {% load i18n %} {% load common_tags %} {% block content_left_head %} - {% trans "Create user" %} + {% trans "Create user" %} {% endblock %} {% block table_head %} @@ -41,7 +41,7 @@ {% endif %} - {% trans 'Edit' %} + {% trans 'Edit' %} {% trans 'Delete' %} diff --git a/apps/users/templates/users/user_edit.html b/apps/users/templates/users/user_update.html similarity index 100% rename from apps/users/templates/users/user_edit.html rename to apps/users/templates/users/user_update.html diff --git a/apps/users/tests/test_views.py b/apps/users/tests/test_views.py index 6552d03b7..5fc2a062e 100644 --- a/apps/users/tests/test_views.py +++ b/apps/users/tests/test_views.py @@ -54,7 +54,7 @@ class UserAddTests(TestCase): 'date_expired': '2086-08-06 19:12:22', } - response = self.client.post(reverse('users:user-add'), data) + response = self.client.post(reverse('users:user-create'), data) self.assertEqual(response.status_code, 302) self.assertEqual(response['location'], reverse('users:user-list')) diff --git a/apps/users/urls.py b/apps/users/urls.py index 27f159f1c..138f6144f 100644 --- a/apps/users/urls.py +++ b/apps/users/urls.py @@ -17,14 +17,14 @@ urlpatterns = [ url(r'^password/reset/success$', views.UserResetPasswordSuccessView.as_view(), name='reset-password-success'), url(r'^user$', views.UserListView.as_view(), name='user-list'), url(r'^user/(?P[0-9]+)$', views.UserDetailView.as_view(), name='user-detail'), - url(r'^user/add$', views.UserAddView.as_view(), name='user-add'), - url(r'^user/(?P[0-9]+)/edit$', views.UserUpdateView.as_view(), name='user-edit'), + url(r'^user/create$', views.UserCreateView.as_view(), name='user-create'), + url(r'^user/(?P[0-9]+)/update$', views.UserUpdateView.as_view(), name='user-update'), url(r'^user/(?P[0-9]+)/delete$', views.UserDeleteView.as_view(), name='user-delete'), - url(r'^usergroup$', views.UserGroupListView.as_view(), name='usergroup-list'), - url(r'^usergroup/(?P[0-9]+)$', views.UserGroupDetailView.as_view(), name='usergroup-detail'), - url(r'^usergroup/add/$', views.UserGroupAddView.as_view(), name='usergroup-add'), - url(r'^usergroup/(?P[0-9]+)/edit$', views.UserGroupUpdateView.as_view(), name='usergroup-edit'), - url(r'^usergroup/(?P[0-9]+)/delete$', views.UserGroupDeleteView.as_view(), name='usergroup-delete'), + url(r'^user-group$', views.UserGroupListView.as_view(), name='user-group-list'), + url(r'^user-group/(?P[0-9]+)$', views.UserGroupDetailView.as_view(), name='user-group-detail'), + url(r'^user-group/create$', views.UserGroupCreateView.as_view(), name='user-group-create'), + url(r'^user-group/(?P[0-9]+)/update$', views.UserGroupUpdateView.as_view(), name='user-group-update'), + url(r'^user-group/(?P[0-9]+)/delete$', views.UserGroupDeleteView.as_view(), name='user-group-delete'), ] @@ -32,6 +32,6 @@ urlpatterns += [ url(r'^v1/users$', api.UserListAddApi.as_view(), name='user-list-api'), url(r'^v1/users/(?P[0-9]+)$', api.UserDetailDeleteUpdateApi.as_view(), name='user-detail-api'), url(r'^v1/users/(?P[0-9]+)/active$', api.UserActiveApi.as_view(), name='user-active-api'), - url(r'^v1/usergroups$', api.UserGroupListAddApi.as_view(), name='usergroup-list-api'), - url(r'^v1/usergroups/(?P[0-9]+)$', api.UserGroupDetailDeleteUpdateApi.as_view(), name='usergroup-detail-api'), + url(r'^v1/usergroups$', api.UserGroupListAddApi.as_view(), name='user-group-list-api'), + url(r'^v1/usergroups/(?P[0-9]+)$', api.UserGroupDetailDeleteUpdateApi.as_view(), name='user-group-detail-api'), ] diff --git a/apps/users/views.py b/apps/users/views.py index 5d61525d8..f23b3a84c 100644 --- a/apps/users/views.py +++ b/apps/users/views.py @@ -20,7 +20,7 @@ from django.contrib.auth import views as auth_view, authenticate, login, logout from common.utils import get_object_or_none from .models import User, UserGroup -from .forms import UserAddForm, UserUpdateForm, UserGroupForm, UserLoginForm +from .forms import UserCreateForm, UserUpdateForm, UserGroupForm, UserLoginForm from .utils import AdminUserRequiredMixin, ssh_key_gen, user_add_success_next, send_reset_password_mail @@ -101,15 +101,15 @@ class UserListView(AdminUserRequiredMixin, ListView): return context -class UserAddView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView): +class UserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView): model = User - form_class = UserAddForm - template_name = 'users/user_add.html' + form_class = UserCreateForm + template_name = 'users/user_create.html' success_url = reverse_lazy('users:user-list') success_message = _('Create user%s success.') def get_context_data(self, **kwargs): - context = super(UserAddView, self).get_context_data(**kwargs) + context = super(UserCreateView, self).get_context_data(**kwargs) context.update({'app': _('Users'), 'action': _('Create user')}) return context @@ -118,7 +118,7 @@ class UserAddView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView): user.created_by = self.request.user.username or 'System' user.save() user_add_success_next(user) - return super(UserAddView, self).form_valid(form) + return super(UserCreateView, self).form_valid(form) def get_success_message(self, cleaned_data): return self.success_message % ( @@ -130,7 +130,7 @@ class UserAddView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView): class UserUpdateView(AdminUserRequiredMixin, UpdateView): model = User form_class = UserUpdateForm - template_name = 'users/user_edit.html' + template_name = 'users/user_update.html' context_object_name = 'user' success_url = reverse_lazy('users:user-list') @@ -175,8 +175,8 @@ class UserDetailView(AdminUserRequiredMixin, DetailView): class UserGroupListView(AdminUserRequiredMixin, ListView): model = UserGroup paginate_by = settings.CONFIG.DISPLAY_PER_PAGE - context_object_name = 'usergroup_list' - template_name = 'users/usergroup_list.html' + context_object_name = 'user_group_list' + template_name = 'users/user_group_list.html' ordering = '-date_added' def get_queryset(self): @@ -196,26 +196,26 @@ class UserGroupListView(AdminUserRequiredMixin, ListView): return context -class UserGroupAddView(AdminUserRequiredMixin, CreateView): +class UserGroupCreateView(AdminUserRequiredMixin, CreateView): model = UserGroup form_class = UserGroupForm - template_name = 'users/usergroup_add.html' - success_url = reverse_lazy('users:usergroup-list') + template_name = 'users/user_group_create.html' + success_url = reverse_lazy('users:user-group-list') def get_context_data(self, **kwargs): - context = super(UserGroupAddView, self).get_context_data(**kwargs) + context = super(UserGroupCreateView, self).get_context_data(**kwargs) users = User.objects.all() - context.update({'app': _('Users'), 'action': _('Create usergroup'), 'users': users}) + context.update({'app': _('Users'), 'action': _('Create user group'), 'users': users}) return context def form_valid(self, form): - usergroup = form.save() + user_group = form.save() users_id_list = self.request.POST.getlist('users', []) users = [get_object_or_404(User, id=user_id) for user_id in users_id_list] - usergroup.created_by = self.request.user.username or 'Admin' - usergroup.users.add(*tuple(users)) - usergroup.save() - return super(UserGroupAddView, self).form_valid(form) + user_group.created_by = self.request.user.username or 'Admin' + user_group.users.add(*tuple(users)) + user_group.save() + return super(UserGroupCreateView, self).form_valid(form) class UserGroupUpdateView(UpdateView): diff --git a/docs/python_style_guide.md b/docs/python_style_guide.md index ba01c2eb8..dd91900b6 100644 --- a/docs/python_style_guide.md +++ b/docs/python_style_guide.md @@ -3,7 +3,7 @@ ## 语言框架 1. Python 2.7 由于ansible目前不支持python3 2. Django 1.10 (最新版本) -3. Terminal Websocket使用go实现 +3. Terminal Websocket使用go实现 (未来) ## Django规范 @@ -32,7 +32,8 @@ Python方面大致的风格，我们采用pocoo的[Style Guidance](http://www.po #### 最大行长度 -按PEP8规范，Python一般限制最大79个字符, 如果有必要最多84个字符 +按PEP8规范，Python一般限制最大79个字符, 但是Django的命名,url等通常比较长, +而且21世纪都是宽屏了,所以我们限制最大120字符 **补充说明：HTML代码不受此规范约束。**