diff --git a/app/network/views.py b/app/network/views.py index 8705dcaf326f2891c9f1413b05fb8efb3602edb9..2636b81adf7e989c3c55816ab4285a42fc57e0c8 100644 --- a/app/network/views.py +++ b/app/network/views.py @@ -507,7 +507,8 @@ def create_ansible_group(): @bp.route("/domains") @login_required def list_domains(): - return render_template("network/domains.html") + domains = models.Domain.query.all() + return render_template("network/domains.html", domains=domains) @bp.route("/domains/create", methods=("GET", "POST")) @@ -533,7 +534,8 @@ def create_domain(): @bp.route("/scopes") @login_required def list_scopes(): - return render_template("network/scopes.html") + scopes = models.NetworkScope.query.all() + return render_template("network/scopes.html", scopes=scopes) @bp.route("/scopes/create", methods=("GET", "POST")) @@ -703,30 +705,6 @@ def retrieve_ips(subnet, prefix): return jsonify(data=data) -@bp.route("/_retrieve_scopes") -@login_required -def retrieve_scopes(): - data = [ - ( - scope.name, - scope.description, - scope.first_vlan, - scope.last_vlan, - scope.supernet, - str(scope.domain), - ) - for scope in models.NetworkScope.query.all() - ] - return jsonify(data=data) - - -@bp.route("/_retrieve_domains") -@login_required -def retrieve_domains(): - data = [(domain.name,) for domain in models.Domain.query.all()] - return jsonify(data=data) - - @bp.route("/_retrieve_groups") @login_required def retrieve_groups(): diff --git a/app/static/js/domains.js b/app/static/js/domains.js index c0a567f93835617e8aa4ba4018536788911708fe..777943f696a1a2977fdd7b99591612cbbccafe4e 100644 --- a/app/static/js/domains.js +++ b/app/static/js/domains.js @@ -1,13 +1,6 @@ $(document).ready(function() { var domains_table = $("#domains_table").DataTable({ - "ajax": function(data, callback, settings) { - $.getJSON( - $SCRIPT_ROOT + "/network/_retrieve_domains", - function(json) { - callback(json); - }); - }, "paging": false }); diff --git a/app/static/js/scopes.js b/app/static/js/scopes.js index 28a2432c4b8715f45da5cc5cdd7b93982a780940..4bb63058d6424904982715b71fd25d640b1c218b 100644 --- a/app/static/js/scopes.js +++ b/app/static/js/scopes.js @@ -1,13 +1,6 @@ $(document).ready(function() { var scopes_table = $("#scopes_table").DataTable({ - "ajax": function(data, callback, settings) { - $.getJSON( - $SCRIPT_ROOT + "/network/_retrieve_scopes", - function(json) { - callback(json); - }); - }, "paging": false }); diff --git a/app/templates/network/domains.html b/app/templates/network/domains.html index 0284c5f6b69785ab35529a91310cc0d7c1e1a323..fa8698430770481028c593e056e7893e362f4011 100644 --- a/app/templates/network/domains.html +++ b/app/templates/network/domains.html @@ -24,6 +24,13 @@ <th>Name</th> </tr> </thead> + <tbody> + {% for domain in domains %} + <tr> + <td>{{ domain.name }}</td> + </tr> + {% endfor %} + </tbody> </table> {%- endblock %} {%- endblock %} diff --git a/app/templates/network/scopes.html b/app/templates/network/scopes.html index a67676fe3425208bf7133ed8d0edface3b1f4b27..32a6b2565f5fdceb0bb486c929c6a58a4f30966b 100644 --- a/app/templates/network/scopes.html +++ b/app/templates/network/scopes.html @@ -29,6 +29,18 @@ <th>Default domain</th> </tr> </thead> + <tbody> + {% for scope in scopes %} + <tr> + <td>{{ scope.name }}</td> + <td>{{ scope.description }}</td> + <td>{{ scope.first_vlan }}</td> + <td>{{ scope.last_vlan }}</td> + <td>{{ scope.supernet }}</td> + <td>{{ scope.domain }}</td> + </tr> + {% endfor %} + </tbody> </table> {%- endblock %} {%- endblock %}