YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Download CSV from webadmin - missing commit

Browse source
This commit is contained in:
ljf 2021-01-03 19:44:46 +01:00
parent 8e2f1c696b
commit a07314e661
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/user.py
View file

@ -632,10 +632,10 @@ def user_export():
if msettings.get('interface') == 'api': if msettings.get('interface') == 'api':
# We return a raw bottle HTTPresponse (instead of serializable data like # We return a raw bottle HTTPresponse (instead of serializable data like
# list/dict, ...), which is gonna be picked and used directly by moulinette # list/dict, ...), which is gonna be picked and used directly by moulinette
from bottle import LocalResponse from bottle import HTTPResponse
response = LocalResponse(body=body, response = HTTPResponse(body=body,
headers={ headers={
"Content-Disposition": "attachment; filename='users.csv'", "Content-Disposition": "attachment; filename=users.csv",
"Content-Type": "text/csv", "Content-Type": "text/csv",
}) })
return response return response
@ -652,6 +652,7 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
csv -- CSV file with columns username;firstname;lastname;password;mailbox_quota;mail;alias;forward;groups csv -- CSV file with columns username;firstname;lastname;password;mailbox_quota;mail;alias;forward;groups
""" """
import csv # CSV are needed only in this function import csv # CSV are needed only in this function
from moulinette.utils.text import random_ascii from moulinette.utils.text import random_ascii
from yunohost.permission import permission_sync_to_user from yunohost.permission import permission_sync_to_user