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

Add support SourceReadonlyVariables for disk_size

Browse Source
master3.3
Спиридонов Денис 12 years ago
parent 2dbe431bde 8b668495d1
commit 244e226e98
4 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File

54
api/server/api_types.py
Unescape View File

@ -19,6 +19,8 @@ from soaplib.serializers.primitive import String, Integer, Boolean, Any
from soaplib.serializers.clazz import Array, ClassSerializer
from soaplib.service import rpc
import sys
from itertools import *
from calculate.lib.datavars import SourceReadonlyVariable
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('calculate_api',sys.modules[__name__])
@ -67,15 +69,24 @@ class ChoiceValue(DataVarsSerializer):
comments = Array(String)
onChanged = Array(String)
def __init__(self,dv=None,varObj=None,**kwargs):
def __init__(self,dv=None,varObj=None,readOnly=False,**kwargs):
if dv:
super(ChoiceValue,self).__init__()
self.values, self.comments = self.getChoice(varObj)
if not readOnly:
self.values, self.comments = self.getChoice(varObj)
elif isinstance(varObj,SourceReadonlyVariable):
self.values, self.comments = \
zip(*varObj.getMapHumanReadable().items())
self.values = self.arrayString(self.values)
self.comments = self.arrayString(self.comments)
if varObj.mode == 'w':
self.typefield = varObj.element or \
self.elementByType(varObj.type)
else:
self.typefield = "text"
if readOnly:
self.typefield = "readonly"
else:
self.typefield = "text"
else:
super(ChoiceValue,self).__init__(**kwargs)
@ -114,6 +125,8 @@ class Table(DataVarsSerializer):
self.values.append(ChoiceValue(dv,varSource))
if varSource.mode == 'r' and i == 0:
self.writable = False
else:
self.values.append(ChoiceValue(dv,varSource,readOnly=True))
# get table body
# empty value at start add for fix data transfer
self.body = self.arrayArrayString(dv.Get(varObj.name,
@ -158,7 +171,7 @@ class Field(DataVarsSerializer):
comments = Array(String) # comments for choice
def __init__(self,dv=None,varObj=None,expert=False,briefmode=False,
inbrief=False,**kwargs):
inbrief=False,groupVars=(),**kwargs):
"""
dv - datavars, varObj - current variable, expert - expert variable flag,
briefmode - view request for brief, inbrief - variable palced in brief,
@ -178,7 +191,13 @@ class Field(DataVarsSerializer):
else:
self.uncompatible = dv.Uncompatible(varObj.name)
if self.uncompatible:
dv.Invalidate(varObj.name,onlySet=True)
for var in varObj.reqUncompat:
if not briefmode and var in groupVars:
if not dv.Uncompatible(var.name):
self.uncompatible = ""
break
else:
dv.Invalidate(varObj.name,onlySet=True)
if expert:
self.default = not varObj.wasSet
self.choice, self.comments = self.getChoice(varObj)
@ -219,12 +238,20 @@ class GroupField(DataVarsSerializer):
self.prevlabel = _("Previous")
self.fields = []
# get all variables with deps which using in this group
groupDepVars = []
for varname in chain(info['normal'],info['expert']):
for var in dv.getRequired(varname):
if not var in groupDepVars:
groupDepVars.append(var)
for varname in info['normal']:
inbrief = brief and varname in info['brief']
varObj = dv.getInfo(varname)
self.fields.append(Field(dv=dv,inbrief=inbrief,
briefmode = brief,
varObj=dv.getInfo(varname)))
varObj=varObj,
groupVars=groupDepVars))
if info['expert']:
for varname in info['expert']:
if expert == True or \
@ -235,10 +262,12 @@ class GroupField(DataVarsSerializer):
value="open"))
for varname in info['expert']:
inbrief = brief and varname in info['brief']
varObj = dv.getInfo(varname)
self.fields.append(Field(dv=dv,expert=True,
inbrief=inbrief,
briefmode = brief,
varObj=dv.getInfo(varname)))
varObj=varObj,
groupVars=groupDepVars))
break
else:
if expert == False:
@ -265,7 +294,10 @@ class ViewInfo(DataVarsSerializer):
lastGroup = len(varGroups)-1
# interate all vars group
if step in(0,-1,None) or allsteps:
self.groups.append(self.stepGroup(varGroups,brief_label))
briefData = datavars.getBrief()
self.groups.append(self.stepGroup(varGroups,brief_label,
help_value=briefData.get("help",None),
next_value=briefData.get("next",None)))
for i, groupInfo in enumerate(varGroups):
if step in (None,-1) or step == i:
self.groups.append(GroupField(dv=datavars,info=groupInfo,
@ -274,13 +306,15 @@ class ViewInfo(DataVarsSerializer):
else:
self.groups = groups
def stepGroup(self,groupInfo,brief_label):
def stepGroup(self,groupInfo,brief_label,help_value=None,next_value=None):
"""Step group"""
return GroupField(fields=[
Field(name = "Steps",
element = "table",
label = brief_label,
type = 'steps',
help = help_value,
value = next_value,
tablevalue = Table(
head = [i['name'] for i in groupInfo],
body = [list(i['normal'])+[""]+list(i['expert'])

5
api/server/baseClass.py
Unescape View File

@ -325,8 +325,9 @@ class Basic (DefinitionBase) :
return self.find_sid_pid_file (sid)
@rpc(String, _returns = Array(Array(String)))
def get_methods ( self, client_type):
return self.serv_get_methods (client_type)
def get_methods ( self, client_type) :
return map(lambda x:map(str,x),
self.serv_get_methods (client_type))
@rpc(_returns = Array(String))
@Dec.check_permissions(['get_sessions'])

2
api/server/decorators.py
Unescape View File

@ -48,4 +48,4 @@ class Dec:
def wrapper(function):
cls.rightsMethods[function.__name__] = add_right
return function
return wrapper
return wrapper

2
api/server/func.py
Unescape View File

@ -540,4 +540,4 @@ def _(s):
def uniq(seq):
seen = set()
seen_add = seen.add
return [ x for x in seq if x not in seen and not seen_add(x)]
return [ x for x in seq if x not in seen and not seen_add(x)]

Write Preview
Loading…
Cancel
Save