From d7af7d64a20e0c6ad3320fc201bab525bb7dac09 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Tue, 17 Jul 2018 21:42:03 +0200 Subject: [PATCH] Une migration de Role pour les gouverner toutes. --- machines/migrations/0084_role.py | 5 ++--- .../migrations/0085_role_specific_role.py | 20 ------------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 machines/migrations/0085_role_specific_role.py diff --git a/machines/migrations/0084_role.py b/machines/migrations/0084_role.py index bb113813..49343809 100644 --- a/machines/migrations/0084_role.py +++ b/machines/migrations/0084_role.py @@ -19,10 +19,9 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('role_type', models.CharField(max_length=255, unique=True)), ('servers', models.ManyToManyField(to='machines.Interface')), + ('specific_role', models.CharField(blank=True, choices=[('dhcp-server', 'DHCP server'), ('switch-conf-server', 'Switches configuration server'), ('dns-recursif-server', 'Recursive DNS server'), ('ntp-server', 'NTP server'), ('radius-server', 'Radius server'), ('log-server', 'Log server'), ('ldap-master-server', 'LDAP master server'), ('ldap-backup-server', 'LDAP backup server'), ('smtp-server', 'SMTP server'), ('postgresql-server', 'postgreSQL server'), ('mysql-server', 'mySQL server'), ('sql-client', 'SQL client'), ('gateway', 'Gatewaw')], max_length=32, null=True)) ], - options={ - 'permissions': (('view_role', 'Peut voir un objet service'),), - }, + options={'permissions': (('view_role', 'Can view a role.'),), 'verbose_name': 'Server role'}, bases=(re2o.mixins.RevMixin, re2o.mixins.AclMixin, models.Model), ), ] diff --git a/machines/migrations/0085_role_specific_role.py b/machines/migrations/0085_role_specific_role.py deleted file mode 100644 index d861f45b..00000000 --- a/machines/migrations/0085_role_specific_role.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2018-07-11 16:49 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('machines', '0084_role'), - ] - - operations = [ - migrations.AddField( - model_name='role', - name='specific_role', - field=models.CharField(blank=True, choices=[('dhcp-server', 'dhcp-server'), ('switch-conf-server', 'switch-conf-server'), ('dns-recursif-server', 'dns-recursif-server'), ('ntp-server', 'ntp-server'), ('radius-server', 'radius-server'), ('ntp-server', 'ntp-server'), ('log-server', 'log-server'), ('ldap-master-server', 'ldap-master-server'), ('ldap-backup-server', 'ldap-backup-server'), ('smtp-server', 'smtp-server'), ('postgresql-server', 'postgresql-server'), ('mysql-server', 'mysql-server'), ('sql-client', 'sql-client'), ('gateway', 'gateway')], max_length=32, null=True), - ), - ]