From c57f155e245fed60d507f6bb72bdfbff82df1e4c Mon Sep 17 00:00:00 2001 From: Yoann Pietri Date: Mon, 15 Jan 2018 01:06:08 +0100 Subject: [PATCH] Oubli d'ajout de fichiers --- .../0033_generaloption_gtu_sum_up.py | 20 +++++++++++++ .../migrations/0034_auto_20180114_2025.py | 25 +++++++++++++++++ .../migrations/0035_auto_20180114_2132.py | 20 +++++++++++++ .../migrations/0036_auto_20180114_2141.py | 20 +++++++++++++ .../migrations/0037_auto_20180114_2156.py | 20 +++++++++++++ .../migrations/0038_auto_20180114_2209.py | 20 +++++++++++++ re2o/templatetags/self_adhesion.py | 28 +++++++++++++++++++ 7 files changed, 153 insertions(+) create mode 100644 preferences/migrations/0033_generaloption_gtu_sum_up.py create mode 100644 preferences/migrations/0034_auto_20180114_2025.py create mode 100644 preferences/migrations/0035_auto_20180114_2132.py create mode 100644 preferences/migrations/0036_auto_20180114_2141.py create mode 100644 preferences/migrations/0037_auto_20180114_2156.py create mode 100644 preferences/migrations/0038_auto_20180114_2209.py create mode 100644 re2o/templatetags/self_adhesion.py diff --git a/preferences/migrations/0033_generaloption_gtu_sum_up.py b/preferences/migrations/0033_generaloption_gtu_sum_up.py new file mode 100644 index 00000000..63c2df5e --- /dev/null +++ b/preferences/migrations/0033_generaloption_gtu_sum_up.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2018-01-14 19:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0032_optionaluser_min_online_payment'), + ] + + operations = [ + migrations.AddField( + model_name='generaloption', + name='GTU_sum_up', + field=models.TextField(blank=True, default='', help_text='Résumé des CGU'), + ), + ] diff --git a/preferences/migrations/0034_auto_20180114_2025.py b/preferences/migrations/0034_auto_20180114_2025.py new file mode 100644 index 00000000..b6969021 --- /dev/null +++ b/preferences/migrations/0034_auto_20180114_2025.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2018-01-14 19:25 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0033_generaloption_gtu_sum_up'), + ] + + operations = [ + migrations.AddField( + model_name='generaloption', + name='GTU', + field=models.FileField(default='', upload_to='GTU'), + ), + migrations.AlterField( + model_name='generaloption', + name='GTU_sum_up', + field=models.TextField(blank=True, default=''), + ), + ] diff --git a/preferences/migrations/0035_auto_20180114_2132.py b/preferences/migrations/0035_auto_20180114_2132.py new file mode 100644 index 00000000..e3767828 --- /dev/null +++ b/preferences/migrations/0035_auto_20180114_2132.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2018-01-14 20:32 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0034_auto_20180114_2025'), + ] + + operations = [ + migrations.AlterField( + model_name='generaloption', + name='GTU', + field=models.FileField(default='', upload_to='/var/www/static/'), + ), + ] diff --git a/preferences/migrations/0036_auto_20180114_2141.py b/preferences/migrations/0036_auto_20180114_2141.py new file mode 100644 index 00000000..1b844ac8 --- /dev/null +++ b/preferences/migrations/0036_auto_20180114_2141.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2018-01-14 20:41 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0035_auto_20180114_2132'), + ] + + operations = [ + migrations.AlterField( + model_name='generaloption', + name='GTU', + field=models.FileField(default='', upload_to=''), + ), + ] diff --git a/preferences/migrations/0037_auto_20180114_2156.py b/preferences/migrations/0037_auto_20180114_2156.py new file mode 100644 index 00000000..efafa806 --- /dev/null +++ b/preferences/migrations/0037_auto_20180114_2156.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2018-01-14 20:56 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0036_auto_20180114_2141'), + ] + + operations = [ + migrations.AlterField( + model_name='generaloption', + name='GTU', + field=models.FileField(default='', null=True, upload_to=''), + ), + ] diff --git a/preferences/migrations/0038_auto_20180114_2209.py b/preferences/migrations/0038_auto_20180114_2209.py new file mode 100644 index 00000000..3077ebff --- /dev/null +++ b/preferences/migrations/0038_auto_20180114_2209.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2018-01-14 21:09 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0037_auto_20180114_2156'), + ] + + operations = [ + migrations.AlterField( + model_name='generaloption', + name='GTU', + field=models.FileField(blank=True, default='', null=True, upload_to=''), + ), + ] diff --git a/re2o/templatetags/self_adhesion.py b/re2o/templatetags/self_adhesion.py new file mode 100644 index 00000000..e940a5a9 --- /dev/null +++ b/re2o/templatetags/self_adhesion.py @@ -0,0 +1,28 @@ +# Re2o est un logiciel d'administration développé initiallement au rezometz. Il +# se veut agnostique au réseau considéré, de manière à être installable en +# quelques clics. +# +# Copyright © 2017 Gabriel Détraz +# Copyright © 2017 Goulven Kermarec +# Copyright © 2017 Augustin Lemesle +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +from django import template +from preferences.models import OptionalUser, GeneralOption +register = template.Library() +@register.simple_tag +def self_adhesion(): + options, _created = OptionalUser.objects.get_or_create() + return options.self_adhesion