summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim O'Shea <tim.oshea753@gmail.com>2016-06-09 17:16:34 -0400
committerTim O'Shea <tim.oshea753@gmail.com>2016-06-09 17:17:48 -0400
commit06d05df4a9f29e382305ea8f002c84cdcdcf5323 (patch)
tree26de482beab053afd98adfbccf4f8bb04d7766a6
parent06a7c934ad2c1229b3a5ad044d515ac025407f0a (diff)
grc: fix parameter blocks, empty Short ID and string type
-rw-r--r--grc/blocks/parameter.xml2
-rw-r--r--grc/core/generator/flow_graph.tmpl5
2 files changed, 5 insertions, 2 deletions
diff --git a/grc/blocks/parameter.xml b/grc/blocks/parameter.xml
index 0c10da48cc..b0713218fd 100644
--- a/grc/blocks/parameter.xml
+++ b/grc/blocks/parameter.xml
@@ -55,7 +55,7 @@
</option>
<option>
<name>String</name>
- <key>string</key>
+ <key>str</key>
<opt>type:string</opt>
</option>
<!-- Do not forget to add option value type handler import into
diff --git a/grc/core/generator/flow_graph.tmpl b/grc/core/generator/flow_graph.tmpl
index 38b113fe90..50b39e1ef1 100644
--- a/grc/core/generator/flow_graph.tmpl
+++ b/grc/core/generator/flow_graph.tmpl
@@ -347,7 +347,10 @@ def argument_parser():
#if $type
#silent $params_eq_list.append('%s=options.%s'%($param.get_id(), $param.get_id()))
parser.add_argument(
- "$make_short_id($param)", "--$param.get_id().replace('_', '-')", dest="$param.get_id()", type=$type, default=$make_default($type, $param),
+ #if $make_short_id($param)
+ "$make_short_id($param)", #slurp
+ #end if
+ "--$param.get_id().replace('_', '-')", dest="$param.get_id()", type=$type, default=$make_default($type, $param),
help="Set $($param.get_param('label').get_evaluated() or $param.get_id()) [default=%default]")
#end if
#end for