From a926b28bbc32667ee61f4f78d61505be434c6bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Mon, 28 May 2018 10:03:15 +0000 Subject: [PATCH] Fix #127 and remove duplicate migration --- CHANGELOG.md | 13 ++++++++++++ apt_requirements.txt | 1 + .../migrations/0081_auto_20180515_2034.py | 21 ------------------- 3 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 machines/migrations/0081_auto_20180515_2034.py diff --git a/CHANGELOG.md b/CHANGELOG.md index df52caf0..3b65a4ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,19 @@ rm static/css/jquery-ui-timepicker-addon.css ``` +## MR 159: Graph topo & MR 164: branche de création de graph + +Add a graph of the network topology +Install *graphviz*: +``` +apt-get -y install graphviz +``` +Create the *media/images* directory: +``` +mkdir -p media/images +``` + + ## MR 163: Fix install re2o Refactored install_re2o.sh script. diff --git a/apt_requirements.txt b/apt_requirements.txt index 18f81b78..46d4c752 100644 --- a/apt_requirements.txt +++ b/apt_requirements.txt @@ -14,3 +14,4 @@ libjs-jquery libjs-jquery-ui libjs-jquery-timepicker libjs-bootstrap +graphviz diff --git a/machines/migrations/0081_auto_20180515_2034.py b/machines/migrations/0081_auto_20180515_2034.py deleted file mode 100644 index c812a310..00000000 --- a/machines/migrations/0081_auto_20180515_2034.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2018-05-15 18:34 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('machines', '0080_auto_20180502_2334'), - ] - - operations = [ - migrations.AlterField( - model_name='extension', - name='soa', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='machines.SOA'), - ), - ]