Changeset - 3816c9e5893c
[Not reviewed]
version_5
0 1 0
Dennis Fink - 9 years ago 2015-10-17 13:42:54
dennis.fink@c3l.lu
Fix api export
1 file changed with 8 insertions and 2 deletions:
0 comments (0 inline, 0 general)
ennstatus/api/views.py
Show inline comments
 
import ipaddress
 
import json
 

	
 
from datetime import datetime
 

	
 
@@ -160,14 +161,19 @@ def export(export_format, server_type):
 
    else:
 
        if server_type == 'all':
 
            current_app.logger.info('Getting all servers!')
 
            servers = [server.json() for server in all_servers()]
 
            servers = [
 
                json.loads(
 
                    server.json()
 
                ) for server in all_servers()
 
            ]
 
        else:
 
            current_app.logger.info('Getting all {}!'.format(server_type))
 
            servers = list(all_servers_by_type(server_type.lower()))
 

	
 
        if export_format == 'json':
 
            current_app.logger.info('Returning as json!')
 
            return str(servers)
 
            return (json.dumps(servers),
 
                    200, {'Content-Type': 'application/json'})
 
        else:
 
            current_app.logger.info('Returning as xml!')
 
            return (render_template('api/export/xml/network.xml',
0 comments (0 inline, 0 general)