Commit 4bbc54bd by aagusti

perubahan resp

1 parent 083dd4d3
...@@ -3,7 +3,6 @@ from datetime import datetime ...@@ -3,7 +3,6 @@ from datetime import datetime
from deform import ValidationFailure, Form, Button from deform import ValidationFailure, Form, Button
from opensipkd.models import flush, DBSession, Menus from opensipkd.models import flush, DBSession, Menus
from pyramid_rpc.jsonrpc import JsonRpcError from pyramid_rpc.jsonrpc import JsonRpcError
from opensipkd.tools.form_api import formfield2dict from opensipkd.tools.form_api import formfield2dict
...@@ -14,11 +13,13 @@ class BaseApi(object): ...@@ -14,11 +13,13 @@ class BaseApi(object):
self.add_schema = {} self.add_schema = {}
self.buttons = () self.buttons = ()
self.data = {} self.data = {}
def make_response(self, resp, **kwargs):
def make_response(self, data, **kwargs):
resp = {"data": data}
code = kwargs.get("code") code = kwargs.get("code")
message = kwargs.get("message") message = kwargs.get("message")
if code: resp.update({"code":code}) if code: resp.update({"code":code})
if message:resp.update({"message":message}) if message: resp.update({"message":message})
return resp return resp
def get_form(self, class_form, row=None, **kwargs): def get_form(self, class_form, row=None, **kwargs):
...@@ -51,7 +52,7 @@ class BaseApi(object): ...@@ -51,7 +52,7 @@ class BaseApi(object):
except ValidationFailure as e: except ValidationFailure as e:
form.set_appstruct(e.cstruct) form.set_appstruct(e.cstruct)
resp.update(formfield2dict(form)) resp.update(formfield2dict(form))
message = "\n".join([v for k,v in e.error.asdict().items()]) message = "\n".join([v for k, v in e.error.asdict().items()])
raise JsonRpcError(message=message, data=resp) raise JsonRpcError(message=message, data=resp)
return dict(c) return dict(c)
...@@ -73,7 +74,7 @@ class BaseApi(object): ...@@ -73,7 +74,7 @@ class BaseApi(object):
continue continue
buttons.append(Button(row.kode, title=row.nama, type="button", buttons.append(Button(row.kode, title=row.nama, type="button",
value=row.url, icon=row.icon)) value=row.url, icon=row.icon, attributes=dict(method=row.url)))
return tuple(buttons) return tuple(buttons)
def update_headers(self, headers): def update_headers(self, headers):
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!