summaryrefslogtreecommitdiffstats
path: root/funcweb
diff options
context:
space:
mode:
authormakkalot <makkalot@gmail.com>2008-06-29 12:26:01 +0300
committermakkalot <makkalot@gmail.com>2008-06-29 12:26:01 +0300
commit022146ff522b64a9f20d553d6b7c1d82b2179e29 (patch)
tree876c94d46399370c6e9bca8a8616845096a622a2 /funcweb
parent3c4803b1aa6045a1667f656968004d9ae1a1409b (diff)
downloadfunc-022146ff522b64a9f20d553d6b7c1d82b2179e29.tar.gz
func-022146ff522b64a9f20d553d6b7c1d82b2179e29.tar.xz
func-022146ff522b64a9f20d553d6b7c1d82b2179e29.zip
Adding better label support and fixing a deprecated warning
Diffstat (limited to 'funcweb')
-rw-r--r--funcweb/funcweb/widget_automation.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/funcweb/funcweb/widget_automation.py b/funcweb/funcweb/widget_automation.py
index 12416c3..3cdccd4 100644
--- a/funcweb/funcweb/widget_automation.py
+++ b/funcweb/funcweb/widget_automation.py
@@ -83,11 +83,11 @@ class WidgetListFactory(object):
#adding the hidden fields (that part wass adde later can be made more generic)
if self.minion:
- self.__widget_list['minion']= getattr(widgets,'HiddenField')(name="minion",value=self.minion,default=self.minion)
+ self.__widget_list['minion']= getattr(widgets,'HiddenField')(name="minion",default=self.minion)
if self.module:
- self.__widget_list['module']= getattr(widgets,'HiddenField')(name="module",value=self.module,default=self.module)
+ self.__widget_list['module']= getattr(widgets,'HiddenField')(name="module",default=self.module)
if self.method:
- self.__widget_list['method']= getattr(widgets,'HiddenField')(name="method",value=self.method,default=self.method)
+ self.__widget_list['method']= getattr(widgets,'HiddenField')(name="method",default=self.method)
@@ -129,7 +129,6 @@ class WidgetListFactory(object):
"""
hash_repeat_data = {
'template':"sampleapp.templates.repeater_form",#may change that if someone doesnt like my design :)
- 'label':'Di Field',
'fields': [
widgets.TextField(name="keyfield",label="Key Field"),
widgets.TextField(name="valuefield",label="Value Field")
@@ -161,7 +160,6 @@ class WidgetListFactory(object):
list_repeat_data = {
'template':"sampleapp.templates.repeater_form",#may change that if someone doesnt like my design :)
'name':'listrepeat',
- 'label':'List Field',
'fields' : [
widgets.TextField(name="listfield",label="List Field")
],
@@ -189,6 +187,7 @@ class WidgetListFactory(object):
"""
#firstly set the name of the argument
setattr(object,"name",argument_name)
+ setattr(object,"label",pretty_label(argument_name))
#print "The argument name is :",argument_name
#print "The argument options are :",argument