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

12
web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Resource Groups for PPAS 9.4 and above"""
import json
import simplejson as json
from functools import wraps
import pgadmin.browser.server_groups.servers as servers
@@ -312,7 +312,9 @@ class ResourceGroupView(NodeView):
'name'
]
data = request.form if request.form else json.loads(request.data.decode())
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
)
for arg in required_args:
if arg not in data:
return make_json_response(
@@ -370,7 +372,9 @@ class ResourceGroupView(NodeView):
required_args = [
'name', 'cpu_rate_limit', 'dirty_rate_limit'
]
data = request.form if request.form else json.loads(request.data.decode())
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
)
try:
sql = render_template("/".join([self.template_path, 'properties.sql']), rgid=rg_id)
@@ -474,7 +478,7 @@ class ResourceGroupView(NodeView):
data = dict()
for k, v in request.args.items():
try:
data[k] = json.loads(v)
data[k] = json.loads(v, encoding='utf-8')
except ValueError:
data[k] = v