dabo Commit
Revision 6153
Date: 2010-10-24 11:13:21 -0700 (Sun, 24 Oct 2010)
Author: Paul
Trac: http://trac.dabodev.com/changeset/6153

Changed:
U   trunk/dabo/lib/datanav/Grid.py
U   trunk/dabo/lib/datanav/Page.py
U   trunk/dabo/lib/datanav/PageFrame.py

Log:
Refactored out some of the updating in datanav. At one time I think 
these calls were required, but they don't seem to be anymore.


Diff:
Modified: trunk/dabo/lib/datanav/Grid.py
===================================================================
--- trunk/dabo/lib/datanav/Grid.py      2010-10-24 17:56:20 UTC (rev 6152)
+++ trunk/dabo/lib/datanav/Grid.py      2010-10-24 18:13:21 UTC (rev 6153)
@@ -120,7 +120,7 @@
        def deleteRecord(self):
                """ Request that the current row be deleted."""
                self.Parent.deleteRecord(self.DataSource)
-               self.fillGrid(True)
+               self.refresh()
 
 
        def _onPickRecord(self, evt=None):

Modified: trunk/dabo/lib/datanav/Page.py
===================================================================
--- trunk/dabo/lib/datanav/Page.py      2010-10-24 17:56:20 UTC (rev 6152)
+++ trunk/dabo/lib/datanav/Page.py      2010-10-24 18:13:21 UTC (rev 6153)
@@ -499,34 +499,23 @@
 
 
        def __onPageEnter(self, evt):
-               self.updateGrid()
+               if not self.itemsCreated:
+                       self.createItems()
                if self.Form.SetFocusToBrowseGrid:
                        self.BrowseGrid.setFocus()
 
 
-       def updateGrid(self):
-               bizobj = self.Form.getBizobj()
-               if not self.itemsCreated:
-                       self.createItems()
-               if bizobj and bizobj.RowCount >= 0:
-                       self.fillGrid(False)
-                       self.BrowseGrid.update()
-
-
        def createItems(self):
                biz = self.Form.getBizobj()
                grid = self.Form.BrowseGridClass(self, NameBase="BrowseGrid", 
Size=(10,10))
                if biz:
                        grid.DataSource = biz.DataSource
                self.Sizer.append(grid, 2, "expand")
+               self.layout()
                self.itemsCreated = True
 
 
-       def fillGrid(self, redraw=False):
-               self.BrowseGrid.populate()
-               self.layout()
 
-
 class EditPage(Page):
        def __init__(self, parent, ds=None, *args, **kwargs):
                super(EditPage, self).__init__(parent, *args, **kwargs)
@@ -564,7 +553,6 @@
        def __onPageEnter(self, evt):
                self.Form.PrimaryBizobj = self.DataSource
                focusToControl = self._focusToControl
-               self.update()
                if focusToControl is not None:
                        focusToControl.setFocus()
                        self._focusToControl = None

Modified: trunk/dabo/lib/datanav/PageFrame.py
===================================================================
--- trunk/dabo/lib/datanav/PageFrame.py 2010-10-24 17:56:20 UTC (rev 6152)
+++ trunk/dabo/lib/datanav/PageFrame.py 2010-10-24 18:13:21 UTC (rev 6153)
@@ -58,7 +58,6 @@
                        ds = ds.DataSource
                self.Form.new(ds)
                self.SelectedPage = self.dsEditPages[ds]
-               self.SelectedPage.update()
 
 
        def deleteByDataSource(self, ds):



_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message: 
http://leafe.com/archives/byMID/[email protected]

Reply via email to