Merge branch 'master' of git.calculate.ru:calculate-3/calculate-api

api/server/api_types.py

@@ -144,7 +144,7 @@ def getViewForVariables(datavars,varsinfo,step=None,expert=None):
             group = GroupField(name=groupname,nextlabel=nextbutton)
             group.fields = []
             group.last = lastGroup == i
-            if True or step == 0:
+            if step in(0,None):
                 group.fields.append(Field(
                         name = "Steps",
                         element = "table",
@@ -172,13 +172,15 @@ def getViewForVariables(datavars,varsinfo,step=None,expert=None):
                                 value="open" if variables else "close"))
                 for varname in variables:
                     varObj = datavars.getInfo(varname)
-                    value = datavars.Get(varname)
                     table = None
+                    if varObj.uncompatible():
+                        datavars.Invalidate(varname,onlySet=True)
                     if varObj.type == "table":
-                        value = map(lambda x:[""]+x,value)
-                        table = Table(head=[],body=value, values = [])
+                        table = Table(head=[],body=[], values = [])
                         for i,col in enumerate(varObj.source):
                             varSource = datavars.getInfo(col)
+                            if varSource.uncompatible():
+                                datavars.Invalidate(col,onlySet=True)
                             table.head.append(varSource.label or varSource.name)
                             if varSource.mode == 'w':
                                 table.values.append(ChoiceValue(
@@ -189,6 +191,10 @@ def getViewForVariables(datavars,varsinfo,step=None,expert=None):
                                 table.values.append(ChoiceValue(
                                     typefield = "text",
                                     values = datavars.Choice(col)))
+                        value = map(lambda x:[""]+x,datavars.Get(varname))
+                        table.body = value
+                    value = datavars.Get(varname)
+
                     listvalue = [""]+value \
                                 if type(value) == list and varObj.type != 'table' \
                                 else None
@@ -200,7 +206,7 @@ def getViewForVariables(datavars,varsinfo,step=None,expert=None):
                             fieldtype = "table"
                     else:
                         fieldtype = varObj.type
-                    if "choice" in fieldtype:
+                    if "choice" in fieldtype or "file" in fieldtype:
                         choice,comments = datavars.ChoiceAndComments(varname)
                         choice = [""]+list(choice)
                         if comments: