From 4f0354b94e700157c0aa948fd91e8580d0f74dfa Mon Sep 17 00:00:00 2001
From: Stefano <ste.pigozzi@gmail.com>
Date: Mon, 18 Sep 2017 16:31:17 +0200
Subject: [PATCH] Remove net_add page

---
 server.py              |  4 ++--
 templates/net/add.htm  | 15 ---------------
 templates/net/show.htm | 20 ++++++++++++--------
 3 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 templates/net/add.htm

diff --git a/server.py b/server.py
index a4cbffc..40496a3 100644
--- a/server.py
+++ b/server.py
@@ -662,7 +662,7 @@ def page_net_add():
     if 'username' not in session:
         return abort(403)
     if request.method == 'GET':
-        return render_template("net/add.htm", pagetype="net", user=session.get("username"))
+        return render_template("net/show.htm", action="add", pagetype="net", user=session.get("username"))
     else:
         try:
             int(request.form["subnet"])
@@ -719,7 +719,7 @@ def page_net_show(nid):
         return abort(403)
     if request.method == 'GET':
         net = Rete.query.filter_by(nid=nid).first_or_404()
-        return render_template("net/show.htm", net=net, pagetype="net", user=session.get("username"))
+        return render_template("net/show.htm", action="show", net=net, pagetype="net", user=session.get("username"))
     else:
         net = Rete.query.filter_by(nid=nid).first_or_404()
         net.nome = request.form['nome']
diff --git a/templates/net/add.htm b/templates/net/add.htm
deleted file mode 100644
index 61bd677..0000000
--- a/templates/net/add.htm
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "base.htm" %}
-{% block title %}Aggiungi rete • estus{% endblock %}
-{% block content %}
-    <h1>
-        Aggiungi nuova rete
-    </h1>
-    <form class="form-inline" action="/net_add" method="post">
-        <input class="form-control" type="text" placeholder="Nome rete" name="nome">
-        <input class="form-control" type="text" placeholder="Network IP" name="network_ip">
-        <input class="form-control" type="text" placeholder="Subnet mask" name="subnet">
-        <input class="form-control" type="text" placeholder="DNS primario" name="primary_dns">
-        <input class="form-control" type="text" placeholder="DNS secondario" name="secondary_dns">
-        <input class="btn btn-primary" type="submit">
-    </form>
-{% endblock %}
diff --git a/templates/net/show.htm b/templates/net/show.htm
index d79ecfc..cd8001d 100644
--- a/templates/net/show.htm
+++ b/templates/net/show.htm
@@ -1,15 +1,19 @@
 {% extends "base.htm" %}
-{% block title %}Aggiungi rete • estus{% endblock %}
+{% block title %}Modifica rete • estus{% endblock %}
 {% block content %}
     <h1>
-        Aggiungi nuova rete
+        {% if action == "add" %}
+            Aggiungi rete
+        {% elif action == "show" %}
+            Modifica rete
+        {% endif %}
     </h1>
-    <form class="form-inline" action="/net_show/{{ net.nid }}" method="post">
-        <input class="form-control" type="text" placeholder="Nome rete" name="nome" value="{{ net.nome }}">
-        <input class="form-control" type="text" placeholder="Network IP" name="network_ip" value="{{ net.network_ip }}">
-        <input class="form-control" type="text" placeholder="Subnet mask" name="subnet" value="{{ net.subnet }}">
-        <input class="form-control" type="text" placeholder="DNS primario" name="primary_dns" value="{{ net.primary_dns }}">
-        <input class="form-control" type="text" placeholder="DNS secondario" name="secondary_dns" value="{{ net.secondary_dns }}">
+    <form class="form-inline" {% if net %}action="/net_show/{{ net.nid }}"{% endif %} method="post">
+        <input class="form-control" type="text" placeholder="Nome rete" name="nome" {% if net %}value="{{ net.nome }}"{% endif %}>
+        <input class="form-control" type="text" placeholder="Network IP" name="network_ip" {% if net %}value="{{ net.network_ip }}"{% endif %}>
+        <input class="form-control" type="text" placeholder="Subnet mask" name="subnet" {% if net %}value="{{ net.subnet }}"{% endif %}>
+        <input class="form-control" type="text" placeholder="DNS primario" name="primary_dns" {% if net %}value="{{ net.primary_dns }}"{% endif %}>
+        <input class="form-control" type="text" placeholder="DNS secondario" name="secondary_dns" {% if net %}value="{{ net.secondary_dns }}"{% endif %}>
         <input class="btn btn-primary" type="submit">
     </form>
 {% endblock %}