FVDE/ennstatus Changeset - eebcc143d129 · Chaos Computer Club Lëtzebuerg Projects

Changeset - eebcc143d129

Parent rev.

Child rev.

[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:

ennstatus/api/views.py

ennstatus/templates/api/export/xml/network.xml

ennstatus/templates/api/export/xml/server.xml

rename

ennstatus/templates/api/export/xml/single_server.xml

0 comments (0 inline, 0 general)

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -73,13 +73,13 @@ def export(export_format, server_type): @@
                     current_app.logger.info('Returning server as json!')
                     return jsonify(server)
                 else:
                     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),
 , {'Content-Type': 'text/xml'})
             else:
                 current_app.logger.warning('Server not found!')
                 return ('Server not found!\n',
 , {'Content-Type': 'text/plain'})
@@ @@ -99,9 +99,9 @@ def export(export_format, server_type): @@
         if export_format == 'json':
             response = {'enn_network': servers}
             current_app.logger.info('Returning as json!')
             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),
 , {'Content-Type': 'text/xml'})

ennstatus/templates/api/export/xml/network.xml

➞

Show inline comments

 <?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

 <?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)