Changeset - eebcc143d129
[Not reviewed]
default
3 1 3
Dennis Fink - 11 years ago 2014-01-25 17:19:35
dennis.fink@c3l.lu
move template files for xml export from extract to export
4 files changed with 4 insertions and 4 deletions:
0 comments (0 inline, 0 general)
ennstatus/api/views.py
Show inline comments
 
@@ -76,7 +76,7 @@ def export(export_format, server_type):
 
                    current_app.logger.info('Returning server as xml!')
 
                    return (
 
                        render_template(
 
                            'api/extract/xml/single_server.xml',
 
                            'api/export/xml/single_server.xml',
 
                            server=server),
 
                        200, {'Content-Type': 'text/xml'})
 
            else:
 
@@ -102,6 +102,6 @@ def export(export_format, server_type):
 
            return jsonify(response)
 
        else:
 
            current_app.logger.info('Returning as xml!')
 
            return (render_template('api/extract/xml/network.xml',
 
            return (render_template('api/export/xml/network.xml',
 
                                    servers=servers),
 
                    200, {'Content-Type': 'text/xml'})
ennstatus/templates/api/export/xml/network.xml
Show inline comments
 
file renamed from ennstatus/templates/api/extract/xml/network.xml to ennstatus/templates/api/export/xml/network.xml
 
<?xml version="1.0" encoding="UTF-8" ?>
 
<enn_network>
 
  {% for server in servers %}
 
    {%- include "api/extract/xml/server.xml" %}
 
    {%- include "api/export/xml/server.xml" %}
 
  {% endfor %}
 
</enn_network>
ennstatus/templates/api/export/xml/server.xml
Show inline comments
 
file renamed from ennstatus/templates/api/extract/xml/server.xml to ennstatus/templates/api/export/xml/server.xml
ennstatus/templates/api/export/xml/single_server.xml
Show inline comments
 
file renamed from ennstatus/templates/api/extract/xml/single_server.xml to ennstatus/templates/api/export/xml/single_server.xml
 
<?xml version="1.0" encoding="UTF-8" ?>
 
{% include "api/extract/xml/server.xml" %}
 
{% include "api/export/xml/server.xml" %}
0 comments (0 inline, 0 general)