diff options
| author | Alexis Metaireau <alexis@notmyidea.org> | 2017-03-20 14:00:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 14:00:51 +0100 |
| commit | 3dac51208d17a517c1f525df6f2ed6572127fcc0 (patch) | |
| tree | 21e9dcf4c82ddefad8728440649b97a351fe0fe7 | |
| parent | c04ace2823755c11f43b50b91b6fdd5175a3c673 (diff) | |
| parent | ceab95b444462093068ba14213841786a5d0ec84 (diff) | |
| download | ihatemoney-mirror-3dac51208d17a517c1f525df6f2ed6572127fcc0.zip ihatemoney-mirror-3dac51208d17a517c1f525df6f2ed6572127fcc0.tar.gz ihatemoney-mirror-3dac51208d17a517c1f525df6f2ed6572127fcc0.tar.bz2 | |
Merge pull request #181 from 0livd/remove_archive
Remove unused archive feature
| -rw-r--r-- | budget/forms.py | 6 | ||||
| -rw-r--r-- | budget/messages.pot | 16 | ||||
| -rw-r--r-- | budget/templates/create_archive.html | 7 | ||||
| -rw-r--r-- | budget/templates/forms.html | 13 | ||||
| -rw-r--r-- | budget/translations/fr/LC_MESSAGES/messages.mo | bin | 8332 -> 8040 bytes | |||
| -rw-r--r-- | budget/translations/fr/LC_MESSAGES/messages.po | 16 | ||||
| -rw-r--r-- | budget/web.py | 15 |
7 files changed, 2 insertions, 71 deletions
diff --git a/budget/forms.py b/budget/forms.py index 7cdb36d..6967983 100644 --- a/budget/forms.py +++ b/budget/forms.py @@ -172,12 +172,6 @@ class InviteForm(FlaskForm): email=email)) -class CreateArchiveForm(FlaskForm): - name = TextField(_("Name for this archive (optional)"), validators=[]) - start_date = DateField(_("Start date"), validators=[Required()]) - end_date = DateField(_("End date"), validators=[Required()], default=datetime.now) - - class ExportForm(FlaskForm): export_type = SelectField(_("What do you want to download ?"), validators=[Required()], diff --git a/budget/messages.pot b/budget/messages.pot index 3c1276b..0b1759b 100644 --- a/budget/messages.pot +++ b/budget/messages.pot @@ -126,10 +126,6 @@ msgstr "" msgid "The email %(email)s is not valid" msgstr "" -#: forms.py:190 -msgid "Name for this archive (optional)" -msgstr "" - #: forms.py:191 msgid "Start date" msgstr "" @@ -201,10 +197,6 @@ msgstr "" msgid "The bill has been modified" msgstr "" -#: web.py:399 -msgid "The data from XX to XX has been archived" -msgstr "" - #: templates/add_bill.html:9 msgid "Back to the list" msgstr "" @@ -292,14 +284,6 @@ msgstr "" msgid "No, thanks" msgstr "" -#: templates/forms.html:109 -msgid "Create an archive" -msgstr "" - -#: templates/forms.html:116 -msgid "Create the archive" -msgstr "" - #: templates/home.html:8 msgid "Manage your shared <br>expenses, easily" msgstr "" diff --git a/budget/templates/create_archive.html b/budget/templates/create_archive.html deleted file mode 100644 index dd7ab86..0000000 --- a/budget/templates/create_archive.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -<form class="form-horizontal" method="post" accept-charset="utf-8"> -{{ forms.create_archive(form) }} -</form> -{% endblock %} diff --git a/budget/templates/forms.html b/budget/templates/forms.html index b4fa236..01e5486 100644 --- a/budget/templates/forms.html +++ b/budget/templates/forms.html @@ -137,19 +137,6 @@ </div> {% endmacro %} -{% macro create_archive(form) %} - <fieldset> - <legend>{{ _("Create an archive") }}</legend> - {{ form.hidden_tag() }} - {{ input(form.name) }} - {{ input(form.start_date) }} - {{ input(form.end_date) }} - </fieldset> - <div class="actions"> - <button class="btn">{{ _("Create the archive") }}</button> - </div> -{% endmacro %} - {% macro export_project(form) %} <fieldset> {{ form.hidden_tag() }} diff --git a/budget/translations/fr/LC_MESSAGES/messages.mo b/budget/translations/fr/LC_MESSAGES/messages.mo Binary files differindex ef40aa5..1794c62 100644 --- a/budget/translations/fr/LC_MESSAGES/messages.mo +++ b/budget/translations/fr/LC_MESSAGES/messages.mo diff --git a/budget/translations/fr/LC_MESSAGES/messages.po b/budget/translations/fr/LC_MESSAGES/messages.po index 44b63f9..8bf347a 100644 --- a/budget/translations/fr/LC_MESSAGES/messages.po +++ b/budget/translations/fr/LC_MESSAGES/messages.po @@ -134,10 +134,6 @@ msgstr "Envoyer les invitations" msgid "The email %(email)s is not valid" msgstr "L'email %(email)s est invalide" -#: forms.py:190 -msgid "Name for this archive (optional)" -msgstr "Nom pour cette archive (optionnel)" - #: forms.py:191 msgid "Start date" msgstr "Date de départ" @@ -225,10 +221,6 @@ msgstr "La facture a été supprimée" msgid "The bill has been modified" msgstr "La facture a été modifiée" -#: web.py:399 -msgid "The data from XX to XX has been archived" -msgstr "Les données de XX à XX ont été archivées" - #: templates/add_bill.html:9 msgid "Back to the list" msgstr "Retourner à la liste" @@ -320,14 +312,6 @@ msgstr "Envoyer les invitations" msgid "No, thanks" msgstr "Non merci" -#: templates/forms.html:109 -msgid "Create an archive" -msgstr "Créer une archive" - -#: templates/forms.html:116 -msgid "Create the archive" -msgstr "Créer l'archive" - #: templates/forms.html:136 msgid "Download this project's data" msgstr "Télécharger les données de ce projet" diff --git a/budget/web.py b/budget/web.py index 9fd6228..18867c5 100644 --- a/budget/web.py +++ b/budget/web.py @@ -19,8 +19,8 @@ from sqlalchemy import orm # local modules from models import db, Project, Person, Bill -from forms import AuthenticationForm, CreateArchiveForm, EditProjectForm, \ - InviteForm, MemberForm, PasswordReminder, ProjectForm, get_billform_for, \ +from forms import AuthenticationForm, EditProjectForm, InviteForm, \ + MemberForm, PasswordReminder, ProjectForm, get_billform_for, \ ExportForm from utils import Redirect303, list_of_dicts2json, list_of_dicts2csv @@ -445,17 +445,6 @@ def settle_bill(): ) -@main.route("/<project_id>/archives/create", methods=["GET", "POST"]) -def create_archive(): - form = CreateArchiveForm() - if request.method == "POST": - if form.validate(): - pass - flash(_("The data from XX to XX has been archived")) - - return render_template("create_archive.html", form=form) - - @main.route("/dashboard") def dashboard(): return render_template("dashboard.html", projects=Project.query.all()) |
