Verbose output and dispatch conf

master3.3
parent 5bcf496226
commit f17342e4f2

@ -16,9 +16,9 @@ import soaplib, sys, time, os
import threading
from soaplib.serializers.primitive import String, Integer, Any, Boolean
from soaplib.serializers.clazz import Array, ClassSerializer
from soaplib.serializers.clazz import Array
from soaplib.service import rpc, DefinitionBase
from calculate.core.server.api_types import ReturnedMessage
from calculate.core.server.api_types import ReturnedMessage,CommonInfo
from calculate.core.server.api_types import ChoiceValue, Table, Option, Field, \
GroupField, ViewInfo, ViewParams
from calculate.lib.datavars import VariableError,DataVarsError
@ -36,37 +36,24 @@ from functools import wraps,WRAPPER_ASSIGNMENTS
__ = getLazyLocalTranslate(_)
class ClientInfo(ClassSerializer):
class ClientInfo(CommonInfo):
"""Parameters for method install"""
cl_localhost_set = Boolean
cl_remote_host_new = String
cl_remote_pw = String
cl_client_mount_set = Boolean
Default = Array(String)
CheckOnly = Boolean
CheckAll = Boolean
class ClientPasswdInfo(ClassSerializer):
class ClientPasswdInfo(CommonInfo):
"""Parameters for method install"""
ur_login = String
ur_user_pw = String
ur_user_new_pw = String
Default = Array(String)
CheckOnly = Boolean
CheckAll = Boolean
class SyncInfo(ClassSerializer):
class SyncInfo(CommonInfo):
"""Parameters for method install"""
ur_login = String
cl_client_sync = Boolean
Default = Array(String)
CheckOnly = Boolean
CheckAll = Boolean
clientCatchExcept = catchExcept(VariableError,DataVarsError,
ClientError)
@ -90,10 +77,12 @@ class Wsdl:
dv.importClient()
dv.flIniFile()
dv.Set('cl_action','domain',True)
dv.Set('cl_dispatch_conf','usenew',True)
dv.addGroup(None,
normal=('cl_localhost_set','cl_remote_host_new',
'cl_remote_pw'),
expert=('cl_client_mount_set',),
expert=('cl_client_mount_set','cl_templates_locate',
'cl_verbose_set','cl_dispatch_conf'),
next_label=_("Configure"))
return dv

Loading…
Cancel
Save