IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix numerous encoding issues. Fixes #1307. Fixes #1479

Browse Source
This commit is contained in:
Murtuza Zabuawala
2016-07-26 15:05:14 +01:00
committed by Dave Page
parent 166d42953c
commit 06e881570a
47 changed files with 463 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/tools/restore/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Restore Utility"""
import json
import simplejson as json
import os
from flask import render_template, request, current_app, \
@@ -175,9 +175,9 @@ def create_restore_job(sid):
if request.form:
# Convert ImmutableDict to dict
data = dict(request.form)
data = json.loads(data['data'][0])
data = json.loads(data['data'][0], encoding='utf-8')
else:
data = json.loads(request.data.decode())
data = json.loads(request.data, encoding='utf-8')
backup_file = filename_with_file_manager_path(data['file'])