Changeset 28

Timestamp:

11/20/08 15:06:37 (7 weeks ago)

Author:

fporcari

Message:

varie da me

Files:

• bin/gnrmkpackage (modified) (2 diffs)
• gnrjs/gnr_d11/js/genro.js (modified) (1 diff)
• gnrpy/packages/_common_d11/webpages/_resources/public.py (modified) (2 diffs)

bin/gnrmkpackage

@@ -38 +38 @@
     main ="""#!/usr/bin/env python
 # encoding: utf-8
+from gnr.app.gnrdbo import GnrDboTable, GnrDboPackage, Table_counter, Table_userobject
 
-class Package(object):
+class Package(GnrDboPackage):
     def config_attributes(self):
         return dict(comment='$name package',
@@ -45 +46 @@
         
     def config_db(self, pkg):
-        testtbl = pkg.table('test', pkey='id')
-        testtbl.column('id', size='22')
+        pass
+        
+class Table(GnrDboTable):
+    pass
 """
     

gnrjs/gnr_d11/js/genro.js

@@ -746 +746 @@
                 var resolver = genro.getRelationResolver(objectUpdate(this.attr.childResolverParams,{'sync':true}));
                 objectUpdate(resolver.kwargs, defaultArgs);
-                var result = new gnr.GnrBagNode(null,'label',null , this.attr.childResolverParams,resolver);
+                var result = new gnr.GnrBagNode(null,'label',null ,this.attr.childResolverParams,resolver);
                 if ((!this._newRowTemplate) || (!objectIsEqual(defaultArgs,this._oldDefaultArgs||{}))){
                     resolver._keepResponse=true;

gnrpy/packages/_common_d11/webpages/_resources/public.py

@@ -551 +551 @@
         
         if filterOn:
-            self._iv_gridFilter(gridId, gridtop, controller, controllerPath, filterOn, kwargs)
-
-        
+            self._iv_gridFilter(gridId, gridtop, controller, controllerPath, filterOn, kwargs)        
         if callable(label):
             label(gridtop)
         else:
             gridtop.div(label,margin_top='2px',float='left')
-
-            
         gridcenter = parentBC.contentPane(region='center', **box_pars)
         view = gridcenter.includedView(extension='includedViewPicker', **viewPars)
-        
         if formPars:
             formPars.setdefault('pane', gridcenter)
             self._includedViewForm(controller, controllerPath, view, formPars)
-            
         if pickerPars:
             pickerPars.setdefault('pane', gridcenter)
             self._iv_Picker(controller, controllerPath, view, pickerPars)
-            
         return view
 
     def _iv_IncludedViewController(self, controller, gridId):
         controller.dataController("""var grid = genro.wdgById(gridId);
-                                     grid.addBagRow('#id', '*', grid.newBagRow(),event);""" , 
+                                     grid.addBagRow('#id', '*', grid.newBagRow(),event);
+                                     """ , 
                             event='^.addRecord', gridId=gridId)
-                            
         delScript = """var grid = genro.wdgById(gridId);
                        var nodesToDel = grid.delBagRow('*', delSelection);"""
         controller.dataController(delScript, _fired='^.delRecord', delSelection='^.delSelection',
                                 idx='=.selectedIndex', gridId=gridId)
-                                
-        controller.dataController("""genro.wdgById(gridId).editBagRow();""" ,fired='^.editRow',gridId=gridId)
-        
-        controller.dataController("""genro.wdgById(gridId).printData();""" ,fired='^.printView',gridId=gridId)
-        controller.dataController("""genro.wdgById(gridId).exportData();""" ,fired='^.exportView',gridId=gridId)
-        controller.dataController("""genro.wdgById(gridId).reload();""" ,fired='^.reloadView',gridId=gridId)
+        controller.dataController("genro.wdgById(gridId).editBagRow();",fired='^.editRow',gridId=gridId)
+        controller.dataController("genro.wdgById(gridId).printData();" ,fired='^.printView',gridId=gridId)
+        controller.dataController("genro.wdgById(gridId).exportData();" ,fired='^.exportView',gridId=gridId)
+        controller.dataController("genro.wdgById(gridId).reload();" ,fired='^.reloadView',gridId=gridId)
         
     def _iv_gridFilter(self, gridId, gridtop, controller, controllerPath, filterOn, kwargs):
@@ -637 +628 @@
         
     def _iv_FormToolbar(self, parentBC, controller, controllerPath, controllerHandler, gridId, 
-                                                add_action=None, add_class=None,add_enable=None,
-                                                del_action=None, del_class=None,del_enable=None,):
+                        add_action=None, add_class=None,add_enable=None,
+                        del_action=None, del_class=None,del_enable=None,):
                                     
         pane = parentBC.contentPane(region='top', height='28px', datapath=controllerPath,overflow='hidden')