[rhmessaging-commits] rhmessaging commits: r3371 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-05-08 14:58:49 -0400 (Fri, 08 May 2009)
New Revision: 3371

Modified:
   mgmt/trunk/cumin/python/cumin/widgets.py
Log:
Save non-sql table checkboxes in hash if widget is update_enabled

Modified: mgmt/trunk/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.py	2009-05-08 15:02:55 UTC (rev 3370)
+++ mgmt/trunk/cumin/python/cumin/widgets.py	2009-05-08 18:58:49 UTC (rev 3371)
@@ -936,10 +936,11 @@
         name = self.param.path
         id = data[self.name]
         attr = id in self.param.get(session) and "checked=\"checked\"" or ""
+        click = self.parent.update_enabled and " onclick=\"cumin.clickTableCheckbox(this, '%s')\"" % name or ""
         html = "<td><input type=\"checkbox\" name=\"%s\" " + \
-            "value=\"%i\" %s/></td>"
+            "value=\"%i\" %s%s/></td>"
 
-        return html % (name, id, attr)
+        return html % (name, id, attr, click)
 
 class CheckboxIdColumn(FormInput, SqlTableColumn):
     def __init__(self, app, name):
@@ -962,34 +963,23 @@
         attr = id in self.param.get(session) and "checked=\"checked\"" or ""
         disa = disabled and "disabled=\"disabled\"" or ""
         click = self.parent.update_enabled and " onclick=\"cumin.clickTableCheckbox(this, '%s')\"" % name or ""
-        t = "<td><input type=\"checkbox\" name=\"%s\" value=\"%i\" %s %s%s/></td>"
+        t = "<td><input type=\"checkbox\" name=\"%s\" value=\"%s\" %s %s%s/></td>"
 
-        return t % (name, id, attr, disa, click)
+        return t % (name, str(id), attr, disa, click)
 
-class CheckboxStringIdColumn(FormInput, SqlTableColumn):
+class CheckboxStringIdColumn(CheckboxIdColumn):
     def __init__(self, app, name):
-        super(CheckboxStringIdColumn, self).__init__(app, name, None)
+        """ calls wrong super to avoid adding integer param """
+        super(CheckboxIdColumn, self).__init__(app, name, None)
 
         self.header_class = CheckboxIdColumnHeader
 
-        param = Parameter(app, "param")
-        self.add_parameter(param)
+        item = Parameter(app, "param")
+        self.add_parameter(item)
 
-        self.param = ListParameter(app, "id", param)
+        self.param = ListParameter(app, "id", item)
         self.add_parameter(self.param)
 
-    def clear(self, session):
-        self.param.set(session, list())
-
-    def do_render(self, session, data, disabled=False):
-        name = self.param.path
-        id = data[self.name]
-        attr = id in self.param.get(session) and "checked=\"checked\"" or ""
-        disa = disabled and "disabled=\"disabled\"" or ""
-        t = "<td><input type=\"checkbox\" name=\"%s\" value=\"%s\" %s %s/></td>"
-
-        return t % (name, id, attr, disa)
-
 class CheckboxIdColumnHeader(ItemTableColumnHeader):
     def render_form_id(self, session, *args):
         return self.column.form.path