|
|
@ -28,7 +28,7 @@ from cl_update import Update,DataVarsUpdate
|
|
|
|
import cl_update
|
|
|
|
import cl_update
|
|
|
|
from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
|
|
|
|
from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
|
|
|
|
from calculate.core.server.decorators import Dec
|
|
|
|
from calculate.core.server.decorators import Dec
|
|
|
|
from calculate.core.server.func import catchExcept
|
|
|
|
from calculate.core.server.func import catchExcept,commonView
|
|
|
|
core_method = Dec.core_method
|
|
|
|
core_method = Dec.core_method
|
|
|
|
setLocalTranslate('cl_update3',sys.modules[__name__])
|
|
|
|
setLocalTranslate('cl_update3',sys.modules[__name__])
|
|
|
|
import traceback
|
|
|
|
import traceback
|
|
|
@ -58,7 +58,7 @@ class Wsdl:
|
|
|
|
rights=['update'])
|
|
|
|
rights=['update'])
|
|
|
|
def update(self, sid, info):
|
|
|
|
def update(self, sid, info):
|
|
|
|
return self.callMethod(sid,info,method_name="update",
|
|
|
|
return self.callMethod(sid,info,method_name="update",
|
|
|
|
logicClass=Desktop,
|
|
|
|
logicClass=Update,
|
|
|
|
method="update")
|
|
|
|
method="update")
|
|
|
|
|
|
|
|
|
|
|
|
def update_vars(self,dv=None):
|
|
|
|
def update_vars(self,dv=None):
|
|
|
@ -66,7 +66,7 @@ class Wsdl:
|
|
|
|
dv = DataVarsUpdate()
|
|
|
|
dv = DataVarsUpdate()
|
|
|
|
dv.importUpdate()
|
|
|
|
dv.importUpdate()
|
|
|
|
dv.flIniFile()
|
|
|
|
dv.flIniFile()
|
|
|
|
dv.Set('cl_action','update',True)
|
|
|
|
dv.Set('cl_action','sync',True)
|
|
|
|
dv.addGroup(None,
|
|
|
|
dv.addGroup(None,
|
|
|
|
normal=('cl_update_world',),
|
|
|
|
normal=('cl_update_world',),
|
|
|
|
next_label=_("Update"))
|
|
|
|
next_label=_("Update"))
|
|
|
@ -74,11 +74,4 @@ class Wsdl:
|
|
|
|
|
|
|
|
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
@rpc(Integer, ViewParams,_returns = ViewInfo)
|
|
|
|
def update_view (self, sid, params):
|
|
|
|
def update_view (self, sid, params):
|
|
|
|
dv = self.get_cache(sid,"update","vars")
|
|
|
|
return commonView(self,sid,params,"update")
|
|
|
|
if not dv:
|
|
|
|
|
|
|
|
dv = self.update_vars()
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
dv.processRefresh()
|
|
|
|
|
|
|
|
view = ViewInfo(dv,viewparams=params)
|
|
|
|
|
|
|
|
self.set_cache(sid, 'update', "vars",dv,smart=False)
|
|
|
|
|
|
|
|
return view
|
|
|
|
|
|
|
|