calculate
/
calculate-utils-3-core
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add ViewParams datatype.

Browse Source
master3.3
Хирецкий Михаил 12 years ago
parent 198bcf3c4c
commit bbc9a9261c
4 changed files with 65 additions and 50 deletions
Show Stats Download Patch File Download Diff File

18
api/server/api_types.py
Unescape View File

@ -267,10 +267,18 @@ class ViewInfo(DataVarsSerializer):
head = [i['name'] for i in groupInfo],
body = [list(i['normal'])+[""]+list(i['expert'])
for i in groupInfo]))])
#element = ['table', 'radio', 'combo', 'comboEdit', 'multichoice', \
#'multichoice_add', 'check', 'check_tristate', 'expert', 'input']
class ViewParams(ClassSerializer):
"""
Struct for _view methods
"""
step = Integer # number of group variables
expert = Boolean # request expert variables
brief = Boolean # request brief variables
################# MESSAGE ####################
class ReturnedMessage(ClassSerializer):
@ -278,7 +286,7 @@ class ReturnedMessage(ClassSerializer):
field = String
message = String
expert = Boolean
def __init__(self, type = None, field = None, message = None,
expert = False):
self.type = type
@ -290,17 +298,17 @@ class Message(ClassSerializer):
type = String
message = String
id = Integer
def __init__(self, type = 'normal', message = None, id = None):
self.type = type
self.message = message
self.id = id
class ReturnProgress(ClassSerializer):
percent = Integer
short_message = String
long_message = String
def __init__(self, percent, short_message = None, long_message = None):
self.percent = percent
self.short_message = short_message

11
api/server/certificate.py
Unescape View File

@ -22,7 +22,7 @@ from soaplib.serializers.primitive import String, Integer, Boolean
from soaplib.serializers.clazz import Array, ClassSerializer
from soaplib.service import rpc
from calculate.api.server.api_types import ReturnedMessage
from calculate.api.server.api_types import Field, GroupField, ViewInfo
from calculate.api.server.api_types import Field, GroupField, ViewInfo, ViewParams
from calculate.lib.datavars import VariableError
from calculate.api import datavars
@ -242,7 +242,8 @@ class ApiWsdl:
method="view_cert_meth",
auto_delete = True,
args_proc = (dv,))
returnmess = ReturnedMessage(type = 'pid', message = pid, expert = True)
returnmess = ReturnedMessage(type = 'pid', message = pid,
expert = True)
returnmess.type = "pid"
returnmess.message = pid
dv = self.clear_cache(sid,methodname)
@ -270,15 +271,15 @@ class ApiWsdl:
self.set_cache(sid, 'view_cert', "vars", dv, smart=False)
return self.certificateCommon(sid,info,'view_cert')
@rpc(Integer, Integer, Boolean,_returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def view_cert_view (self, sid, step, expert):
def view_cert_view (self, sid, params):
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
dv.addGroup(_("Certificate View"),
normal=('cl_cert_id',),
next_label=_("View"))
view = ViewInfo (dv,step,expert)
view = ViewInfo (dv)
self.set_cache(sid, 'view_cert', "vars", dv, smart=False)
return view

48
api/server/edit_groups.py
Unescape View File

@ -21,7 +21,7 @@ from soaplib.serializers.primitive import String, Integer, Boolean
from soaplib.serializers.clazz import Array, ClassSerializer
from soaplib.service import rpc
from calculate.api.server.api_types import ReturnedMessage
from calculate.api.server.api_types import Field, GroupField, ViewInfo
from calculate.api.server.api_types import Field, GroupField, ViewInfo, ViewParams
from calculate.lib.datavars import VariableError
from calculate.lib.utils.files import readLinesFile
@ -217,16 +217,16 @@ class ApiWsdl:
self.set_cache(sid, 'show_groups', "vars", dv, smart=False)
return self.groupCommon(sid,info,'show_groups')
@rpc(Integer, Integer, Boolean,_returns = ViewInfo)
@rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept()
def show_groups_view (self, sid, step,expert):
def show_groups_view (self, sid, params):
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
dv.addGroup(_("Groups"),
normal=('cl_page_count','cl_page_offset'),
next_label=_("Next"))
view = ViewInfo(dv,step,expert)
view = ViewInfo(dv)
self.set_cache(sid, 'show_groups', "vars", dv, smart=False)
return view
@ -239,8 +239,9 @@ class ApiWsdl:
if not info:
mess = 'Field must be in list!'
errors = []
errors.append(ReturnedMessage(type = 'error', field = 'cl_group_name',
message = mess))
errors.append(ReturnedMessage(type = 'error',
field = 'cl_group_name',
message = mess))
return errors
dv = datavars.DataVarsApi()
@ -250,9 +251,9 @@ class ApiWsdl:
self.set_cache(sid, 'detail_request', 'dv', dv, smart = False)
return []
@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def detail_group_view (self, sid, step, expert):
def detail_group_view (self, sid, params):
dv = self.get_cache(sid, 'detail_request', 'dv')
if not dv:
dv = datavars.DataVarsApi()
@ -264,7 +265,7 @@ class ApiWsdl:
normal=('cl_group_name', 'cl_group_rights',
'cl_page_count','cl_page_offset'))
view = ViewInfo(dv,step,expert)
view = ViewInfo(dv)
group = GroupField(name='',last=True)
group.fields = []
@ -347,7 +348,8 @@ class ApiWsdl:
else:
self.printSUCCESS ('<b>'+ _('Not Changed Group')+'</b>')
self.printSUCCESS ("cl_group_name = %s" %cl_group_name)
self.printSUCCESS ("cl_group_rights = %s" %','.join(cl_group_rights))
self.printSUCCESS ("cl_group_rights = %s"
%','.join(cl_group_rights))
return True
except (KeyboardInterrupt,):
self.printERROR('Process is interrupted!')
@ -369,9 +371,9 @@ class ApiWsdl:
self.set_cache(sid, 'change_group', "vars", dv, smart=False)
return self.changeGroupCommon(sid,info,'change_group')
@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def change_group_view (self, sid, step, expert):
def change_group_view (self, sid, params):
dv = self.get_cache(sid, 'change_group', 'dv')
if not dv:
dv = datavars.DataVarsApi()
@ -383,7 +385,7 @@ class ApiWsdl:
normal=('cl_group_name', 'cl_group_rights'),
next_label=_("Done"))
view = ViewInfo(dv,step,expert)
view = ViewInfo(dv)
group = GroupField(name=_("Change group"),nextlabel=_("Done"),last=True)
group.fields = []
@ -407,7 +409,7 @@ class ApiWsdl:
ordered=['cl_group_name'],
allvars=True)
if errors:
return errors
return errors
request_meth = type("delGroupCommon",(self.Common,
ApiWsdl, object), {})
pid = self.startprocess(sid, target=request_meth,
@ -457,14 +459,14 @@ class ApiWsdl:
except KeyboardInterrupt:
self.endTask()
return False
except Exception, e:
except Exception as e:
msg = e.message
if not msg:
msg = e.reason
self.printERROR (_("Exception!%s") %msg)
return False
@rpc(Integer, DetailGroupInfo, _returns = Array(ReturnedMessage))
@Dec.check_permissions(["edit-group"])
#@Dec.console('cl-show-request')
@ -480,9 +482,9 @@ class ApiWsdl:
self.set_cache(sid, 'delete_group', "vars", dv, smart=False)
return self.delGroupCommon(sid,info,'delete_group')
@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def delete_group_view (self, sid, step, expert):
def delete_group_view (self, sid, params):
dv = self.get_cache(sid, 'delete_group', 'dv')
if not dv:
dv = datavars.DataVarsApi()
@ -494,7 +496,7 @@ class ApiWsdl:
normal=('cl_group_name', 'cl_group_rights'),
next_label=_("Delete"))
view = ViewInfo(dv,step,expert)
view = ViewInfo(dv)
self.set_cache(sid, 'delete_group', "vars", dv, smart=False)
return view
@ -587,9 +589,9 @@ class ApiWsdl:
self.set_cache(sid, 'add_group', "vars", dv, smart=False)
return self.delGroupCommon(sid,info,'add_group')
@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def add_group_view (self, sid, step, expert):
def add_group_view (self, sid, params):
dv = self.get_cache(sid, 'add_group', 'dv')
if not dv:
dv = datavars.DataVarsApi()
@ -601,6 +603,6 @@ class ApiWsdl:
normal=('cl_group_add', 'cl_group_rights'),
next_label=_("Add"))
view = ViewInfo(dv,step,expert)
view = ViewInfo(dv)
self.set_cache(sid, 'add_group', "vars", dv, smart=False)
return view

38
api/server/request.py
Unescape View File

@ -21,7 +21,7 @@ from soaplib.serializers.primitive import String, Integer, Boolean
from soaplib.serializers.clazz import Array, ClassSerializer
from soaplib.service import rpc
from calculate.api.server.api_types import ReturnedMessage
from calculate.api.server.api_types import Field, GroupField, ViewInfo
from calculate.api.server.api_types import Field, GroupField, ViewInfo, ViewParams
from calculate.lib.datavars import VariableError
from calculate.api import datavars
@ -219,16 +219,16 @@ class ApiWsdl:
self.set_cache(sid, 'show_request', "vars", dv, smart=False)
return self.requestCommon(sid,info,'show_request')
@rpc(Integer, Integer, Boolean,_returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def show_request_view (self, sid, step,expert):
def show_request_view (self, sid, params):
dv = datavars.DataVarsApi()
dv.importApi()
dv.flIniFile()
dv.addGroup(_("Requests"),
normal=('cl_page_count','cl_page_offset'),
next_label=_("Next"))
view = ViewInfo (dv,step,expert)
view = ViewInfo (dv)
self.set_cache(sid, 'show_request', "vars", dv, smart=False)
return view
@ -252,9 +252,9 @@ class ApiWsdl:
self.set_cache(sid, 'detail_request', 'dv', dv, smart = False)
return []
@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def detail_request_view (self, sid, step, expert):
def detail_request_view (self, sid, params):
dv = self.get_cache(sid, 'detail_request', 'dv')
if not dv:
dv = datavars.DataVarsApi()
@ -267,7 +267,7 @@ class ApiWsdl:
'cl_req_date', 'cl_req_location', 'cl_req_group',
'cl_page_count','cl_page_offset'))
view = ViewInfo (dv,step,expert)
view = ViewInfo (dv)
group = GroupField(name='',nextlabel=_("Done"),last=True)
group.fields = []
@ -363,7 +363,8 @@ class ApiWsdl:
fc.write(cfg_text)
fc.close()
cmd = ("openssl x509 -req -days 11000 -CA %s -CAkey %s -CAcreateserial "
cmd = ("openssl x509 -req -days 11000 -CA %s -CAkey %s "
"-CAcreateserial "
"-extfile %s -extensions ssl_client -in %s -out %s") \
%(server_cert, server_key, config, cl_req, cl_cert)
print cmd
@ -405,9 +406,9 @@ class ApiWsdl:
self.set_cache(sid, 'confirm_request', "vars", dv, smart=False)
return self.confirmRequestCommon(sid,info,'confirm_request')
@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def confirm_request_view (self, sid, step, expert):
def confirm_request_view (self, sid, params):
dv = self.get_cache(sid, 'confirm_request', 'dv')
if not dv:
dv = datavars.DataVarsApi()
@ -420,9 +421,10 @@ class ApiWsdl:
'cl_req_date', 'cl_req_location', 'cl_req_group'),
next_label=_("Done"))
view = ViewInfo (dv,step,expert)
view = ViewInfo (dv)
group = GroupField(name=_("Requests detail"),nextlabel=_("Done"),last=True)
group = GroupField(name=_("Requests detail"),nextlabel=_("Done"),
last=True)
group.fields = []
group.fields.append(Field(
name = "but2",
@ -485,7 +487,8 @@ class ApiWsdl:
# chect exists request and certificate files
if not os.path.exists(request) and not os.path.exists(cert):
self.printERROR (_("Request and certificate with id = %s not found!") \
self.printERROR (
_("Request and certificate with id = %s not found!") \
%id_del_req)
return False
@ -552,9 +555,9 @@ class ApiWsdl:
self.set_cache(sid, 'delete_request', "vars", dv, smart=False)
return self.delRequestCommon(sid,info,'delete_request')
@rpc(Integer, Integer, Boolean, _returns = ViewInfo)
@rpc(Integer, ViewParams, _returns = ViewInfo)
@catchExcept()
def delete_request_view (self, sid, step, expert):
def delete_request_view (self, sid, params):
dv = self.get_cache(sid, 'detail_request', 'dv')
if not dv:
dv = datavars.DataVarsApi()
@ -567,9 +570,10 @@ class ApiWsdl:
'cl_req_date', 'cl_req_location', 'cl_req_group'),
next_label=_("Done"))
view = ViewInfo (dv,step,expert)
view = ViewInfo (dv)
group = GroupField(name=_("Requests detail"),nextlabel=_("Done"),last=True)
group = GroupField(name=_("Requests detail"),nextlabel=_("Done"),
last=True)
group.fields = []
group.fields.append(Field(
name = "but2",

Write Preview
Loading…
Cancel
Save