Browse Source

wxGUI/gmodeler: fix GetParams()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@66946 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 9 years ago
parent
commit
de8b10b5dd
1 changed files with 6 additions and 7 deletions
  1. 6 7
      gui/wxpython/gmodeler/model.py

+ 6 - 7
gui/wxpython/gmodeler/model.py

@@ -1187,19 +1187,18 @@ class ModelAction(ModelObject, ogl.DividedShape):
         """
         """
         self.isValid = True
         self.isValid = True
 
 
-        options = self.GetParameterizedParams()
-        if options['flags'] or options['params']:
-            self.isParameterized = True
-        else:
-            self.isParameterized = False
+        for f in options['flags']:
+            if f.get('parameterized', False):
+                self.isParameterized = True
+                break
 
 
-        options = self.GetParams()
         for p in options['params']:
         for p in options['params']:
             if self.isValid and p.get('required', False) and \
             if self.isValid and p.get('required', False) and \
                p.get('value', '') == '' and \
                p.get('value', '') == '' and \
                p.get('default', '') == '':
                p.get('default', '') == '':
                 self.isValid = False
                 self.isValid = False
-                break
+            if not self.isParameterized and p.get('parameterized', False):
+                self.isParameterized = True
         
         
         if self.parent.GetCanvas():
         if self.parent.GetCanvas():
             self._setBrush()
             self._setBrush()