gnue/designer/templates/forms FormBuilder.py Si...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/11/07 23:32:05

Modified files:
        designer/templates/forms: FormBuilder.py SimpleDetail.py 

Log message:
        Fixed broken wizards

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/templates/forms/FormBuilder.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/templates/forms/SimpleDetail.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue/designer/templates/forms/FormBuilder.py
diff -c gnue/designer/templates/forms/FormBuilder.py:1.8 
gnue/designer/templates/forms/FormBuilder.py:1.9
*** gnue/designer/templates/forms/FormBuilder.py:1.8    Wed Aug 21 18:55:16 2002
--- gnue/designer/templates/forms/FormBuilder.py        Thu Nov  7 23:32:05 2002
***************
*** 62,68 ****
    #
    def Start(self, form, current):
      self.form = form
! 
      # The first table can never have a master
      self.variables['hasmaster0'] = '0'
      self.variables['newPage0'] = '0'
--- 62,68 ----
    #
    def Start(self, form, current):
      self.form = form
!     print current
      # The first table can never have a master
      self.variables['hasmaster0'] = '0'
      self.variables['newPage0'] = '0'
***************
*** 312,318 ****
                                           required=1,set=(('1','Yes'),
                                                           ('0','No')
                                                           )),
!                              WizardInput('newPage%s' % (iteration+1),
                                           label='If yes, put this table on a 
new page?',
                                           required=1,set=(('0','No'),
                                                           ('1','Yes')
--- 312,319 ----
                                           required=1,set=(('1','Yes'),
                                                           ('0','No')
                                                           )),
! #                             WizardInput('newPage%s' % (iteration+1),
!                              WizardInput('newPage',
                                           label='If yes, put this table on a 
new page?',
                                           required=1,set=(('0','No'),
                                                           ('1','Yes')
***************
*** 352,358 ****
    def Finalize(self):
      # Create a single page on which to place blocks and labels
      pageCounter = 1
!     page = self.current.findParentOfType('GFPage')
      if not page:
        page = self.AddElement('page', self.form,
         {  'name': 'pg%s' % pageCounter })
--- 353,364 ----
    def Finalize(self):
      # Create a single page on which to place blocks and labels
      pageCounter = 1
!     page = None
!     for child in self.form._children:
!       if child._type == 'GFPage':
!         page = child
!         break
!                             
      if not page:
        page = self.AddElement('page', self.form,
         {  'name': 'pg%s' % pageCounter })
Index: gnue/designer/templates/forms/SimpleDetail.py
diff -c gnue/designer/templates/forms/SimpleDetail.py:1.7 
gnue/designer/templates/forms/SimpleDetail.py:1.8
*** gnue/designer/templates/forms/SimpleDetail.py:1.7   Sat Sep 28 10:48:03 2002
--- gnue/designer/templates/forms/SimpleDetail.py       Thu Nov  7 23:32:05 2002
***************
*** 256,263 ****
            'name': 'dts%s' %  tableKey })
  
      # Create a single page on which to place blocks and labels
!     page = self.AddElement('page', self.form,
!        {  'name': 'pg%s' % tableKey })
  
  
      # We will need a block to hold our entries...
--- 256,270 ----
            'name': 'dts%s' %  tableKey })
  
      # Create a single page on which to place blocks and labels
!     page = None
!     for child in self.form._children:
!       if child._type == 'GFPage':
!         page = child
!         break
!       
!     if not page:
!       page = self.AddElement('page', self.form,
!          {  'name': 'pg%s' % tableKey })
  
  
      # We will need a block to hold our entries...