[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/src/GConditions.py common/src/GData...
|
From: |
James Thompson |
|
Subject: |
gnue common/src/GConditions.py common/src/GData... |
|
Date: |
Thu, 10 Jan 2002 15:59:19 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 02/01/10 15:59:18
Modified files:
common/src : GConditions.py GDataObjects.py GDataSource.py
common/src/dbdrivers/_dbsig: DBdriver.py
common/src/dbdrivers/_pgsql: DBdriver.py
common/src/dbdrivers/cxoracle: DBdriver.py
common/src/dbdrivers/informix: DBdriver.py
common/src/dbdrivers/ingres: DBdriver.py
common/src/dbdrivers/interbase: DBdriver.py
common/src/dbdrivers/msado: DBdriver.py
common/src/dbdrivers/mxodbc: DBdriver.py
common/src/dbdrivers/mysql: DBdriver.py
common/src/dbdrivers/odbc: DBdriver.py
common/src/dbdrivers/oracle: DBdriver.py
common/src/dbdrivers/sapdb: DBdriver.py
common/src/dbdrivers/sqlrelay: DBdriver.py
common/src/dbdrivers/sybase: DBdriver.py
forms/src : GFForm.py
Log message:
db driver cleanup
merged post methods back into GDataSource
Fixed bug in conditional arg checking
combineConditionals now knows how to deal with dict structures
<entry> default values now insert properly on commit
last query retrieval now works with entries that have a queryDefault
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConditions.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataObjects.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataSource.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_pgsql/DBdriver.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/cxoracle/DBdriver.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/informix/DBdriver.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/ingres/DBdriver.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/interbase/DBdriver.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/msado/DBdriver.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/mxodbc/DBdriver.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/mysql/DBdriver.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/odbc/DBdriver.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/oracle/DBdriver.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/sapdb/DBdriver.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/sqlrelay/DBdriver.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/sybase/DBdriver.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.139&tr2=1.140&r1=text&r2=text
Patches:
Index: gnue/common/src/GConditions.py
diff -c gnue/common/src/GConditions.py:1.7 gnue/common/src/GConditions.py:1.8
*** gnue/common/src/GConditions.py:1.7 Wed Jan 9 22:33:49 2002
--- gnue/common/src/GConditions.py Thu Jan 10 15:59:17 2002
***************
*** 64,72 ****
def combineConditions (cond1, cond2):
if cond1 == None or cond1 == {}:
return cond2
! elif cond2 == None or cond1 == {}:
return cond1
! elif not len(cond1._children):
cond1._children = cond2._children
return cond1
elif len(cond2._children):
--- 64,78 ----
def combineConditions (cond1, cond2):
if cond1 == None or cond1 == {}:
return cond2
! elif cond2 == None or cond2 == {}:
return cond1
!
! if type(cond1) == type({}):
! cond1 = buildConditionFromDict(cond1)
! if type(cond2) == type({}):
! cond1 = buildConditionFromDict(cond2)
!
! if not len(cond1._children):
cond1._children = cond2._children
return cond1
elif len(cond2._children):
Index: gnue/common/src/GDataObjects.py
diff -c gnue/common/src/GDataObjects.py:1.35
gnue/common/src/GDataObjects.py:1.36
*** gnue/common/src/GDataObjects.py:1.35 Wed Jan 9 22:33:49 2002
--- gnue/common/src/GDataObjects.py Thu Jan 10 15:59:17 2002
***************
*** 383,388 ****
--- 383,389 ----
return 1
+
# Insert a blank record after the current record
def insertRecord(self):
if self.isReadOnly():
***************
*** 423,449 ****
break
return isPending
# Returns 1=DataObject has uncommitted changes
def isRecordPending(self):
return self.current.isPending()
# Post changes to the database
def post(self, foreign_keys={}):
# post our changes
i = 0
for record in self._cachedRecords:
- # Get rid of empty records
- if record._emptyFlag:
- record._deleteFlag = 1
-
-
- # Adjust the current record if a preceding record is deleted
- if record._deleteFlag and i <= self._currentRecord:
- self._currentRecord -= 1
-
- # Perform the post for this record
for field in foreign_keys.keys():
record._fields[field] = foreign_keys[field]
# Some DBs will throw an exception if you update a Primary Key
--- 424,451 ----
break
return isPending
+
+
# Returns 1=DataObject has uncommitted changes
def isRecordPending(self):
return self.current.isPending()
+
+
# Post changes to the database
def post(self, foreign_keys={}):
# post our changes
+ self._update_cursor = self._dataObject._dataConnection.cursor()
i = 0
for record in self._cachedRecords:
+ # Flip the flag for 'default' values to true so that hidden
+ # default fields are included in insert statements
+ for field in self._dataObject._defaultValues.keys():
+ if record.isPending():
+ print "Setting %s to %s" % (field, record.getField(field))
+ record.setField(field, record.getField(field))
for field in foreign_keys.keys():
record._fields[field] = foreign_keys[field]
# Some DBs will throw an exception if you update a Primary Key
***************
*** 451,463 ****
if record._insertFlag:
record._modifiedFlags[field] = 1
record.post()
! # Adjust the recordCount if the record is to be deleted
! self._recordCount -= 1
!
! i += 1
# Move to record 0 if all preceding records were deleted
# (or set to -1 if all records were deleted)
--- 453,470 ----
if record._insertFlag:
record._modifiedFlags[field] = 1
+ delete = record._emptyFlag or record._deleteFlag
record.post()
! # Adjust the current record if a preceding record is deleted
! if delete and i <= self._currentRecord:
! self._currentRecord -= 1
+ if delete:
+ self._cachedRecords.pop(i)
+ self._recordCount -= 1
+ else:
+ i += 1
# Move to record 0 if all preceding records were deleted
# (or set to -1 if all records were deleted)
***************
*** 470,475 ****
--- 477,483 ----
self._currentRecord = self._recordCount - 1
+
def notifyDetailObjects(self):
GDebug.printMesg(5,'Master record changed; Notifying Detail Objects')
for detail in self._dataObject._detailObjects:
***************
*** 480,486 ****
# Returns 1=Field is bound to a database field
def isFieldBound(self, fieldName):
-
return self._dataObject._fieldReferences.has_key(string.lower(fieldName))
--- 488,493 ----
Index: gnue/common/src/GDataSource.py
diff -c gnue/common/src/GDataSource.py:1.22 gnue/common/src/GDataSource.py:1.23
*** gnue/common/src/GDataSource.py:1.22 Wed Jan 9 22:33:49 2002
--- gnue/common/src/GDataSource.py Thu Jan 10 15:59:17 2002
***************
*** 88,94 ****
self._dataObject._unboundFieldReferences = self._unboundFieldReferences
self._dataObject._defaultValues = self._defaultValues
for child in self._children:
- print child
if isinstance(child, GConditions.GCondition):
self._dataObject._staticCondition = child
break
--- 88,93 ----
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.31
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.32
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.31 Wed Jan 9 22:33:49 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py Thu Jan 10 15:59:17 2002
***************
*** 152,200 ****
GDebug.printMesg(5, 'ResultSet created')
-
- # Post changes to the database
- def post(self, foreign_keys={}):
- # post our changes
- self._update_cursor = self._dataObject._dataConnection.cursor()
-
- currentRecord = self._currentRecord
-
- i = 0
- while i < len(self._cachedRecords):
-
- record = self._cachedRecords[i]
- for field in foreign_keys.keys():
- record._fields[field] = foreign_keys[field]
- # Some DBs will throw an exception if you update a Primary Key
- # (even if you are updating to the same value)
- if record._insertFlag:
- record._modifiedFlags[field] = 1
-
- delete = record._emptyFlag or record._deleteFlag
- record.post()
-
- # Adjust the current record if a preceding record is deleted
- if delete and i <= self._currentRecord:
- self._currentRecord -= 1
-
- if delete:
- self._cachedRecords.pop(i)
- self._recordCount -= 1
- else:
- i += 1
-
- # Move to record 0 if all preceding records were deleted
- # (or set to -1 if all records were deleted)
- if self._currentRecord < 0:
- if len(self._cachedRecords):
- self._currentRecord = 0
- else:
- self._currentRecord = -1
- if self._currentRecord >= self._recordCount:
- self._currentRecord = self._recordCount - 1
-
-
def _loadNextRecord(self):
if self._cursor:
rs = None
--- 152,157 ----
Index: gnue/common/src/dbdrivers/_pgsql/DBdriver.py
diff -c gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.4
gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.5
*** gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.4 Tue Jan 8 22:59:11 2002
--- gnue/common/src/dbdrivers/_pgsql/DBdriver.py Thu Jan 10 15:59:17 2002
***************
*** 221,227 ****
rv = cursor.fetchone()
cursor.close()
except:
! print "You've got your bar in my foo! And you've got your foo on my
bar! Two great reams that ream well together!"
GDebug.printMesg(1,"**** Unable to execute extension query")
GDebug.printMesg(1,"**** %s" % sys.exc_info()[1])
cursor.close()
--- 221,227 ----
rv = cursor.fetchone()
cursor.close()
except:
! print "DBdriver.py", "You've got your bar in my foo! And you've got
your foo on my bar! Two great reams that ream well together!"
GDebug.printMesg(1,"**** Unable to execute extension query")
GDebug.printMesg(1,"**** %s" % sys.exc_info()[1])
cursor.close()
Index: gnue/common/src/dbdrivers/cxoracle/DBdriver.py
diff -c gnue/common/src/dbdrivers/cxoracle/DBdriver.py:1.5
gnue/common/src/dbdrivers/cxoracle/DBdriver.py:1.6
*** gnue/common/src/dbdrivers/cxoracle/DBdriver.py:1.5 Thu Nov 8 02:55:52 2001
--- gnue/common/src/dbdrivers/cxoracle/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 199,207 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because Oracle_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
Oracle_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 199,204 ----
Index: gnue/common/src/dbdrivers/informix/DBdriver.py
diff -c gnue/common/src/dbdrivers/informix/DBdriver.py:1.4
gnue/common/src/dbdrivers/informix/DBdriver.py:1.5
*** gnue/common/src/dbdrivers/informix/DBdriver.py:1.4 Sun Nov 11 01:11:02 2001
--- gnue/common/src/dbdrivers/informix/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 115,123 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because Informix_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
Informix_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 115,120 ----
Index: gnue/common/src/dbdrivers/ingres/DBdriver.py
diff -c gnue/common/src/dbdrivers/ingres/DBdriver.py:1.5
gnue/common/src/dbdrivers/ingres/DBdriver.py:1.6
*** gnue/common/src/dbdrivers/ingres/DBdriver.py:1.5 Sun Nov 11 01:11:02 2001
--- gnue/common/src/dbdrivers/ingres/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 108,116 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because Ingres_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
Ingres_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 108,113 ----
Index: gnue/common/src/dbdrivers/interbase/DBdriver.py
diff -c gnue/common/src/dbdrivers/interbase/DBdriver.py:1.4
gnue/common/src/dbdrivers/interbase/DBdriver.py:1.5
*** gnue/common/src/dbdrivers/interbase/DBdriver.py:1.4 Sun Nov 11 01:11:02 2001
--- gnue/common/src/dbdrivers/interbase/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 111,119 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because Interbase_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
Interbase_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 111,116 ----
Index: gnue/common/src/dbdrivers/msado/DBdriver.py
diff -c gnue/common/src/dbdrivers/msado/DBdriver.py:1.1
gnue/common/src/dbdrivers/msado/DBdriver.py:1.2
*** gnue/common/src/dbdrivers/msado/DBdriver.py:1.1 Wed Nov 14 19:13:09 2001
--- gnue/common/src/dbdrivers/msado/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 284,332 ****
GDebug.printMesg(5, 'ResultSet created')
-
- # Post changes to the database
- def post(self, foreign_keys={}):
- # post our changes
- self._update_cursor = self._dataObject._dataConnection.cursor()
-
- currentRecord = self._currentRecord
-
- i = 0
- while i < len(self._cachedRecords):
-
- record = self._cachedRecords[i]
- for field in foreign_keys.keys():
- record._fields[field] = foreign_keys[field]
- # Some DBs will throw an exception if you update a Primary Key
- # (even if you are updating to the same value)
- if record._insertFlag:
- record._modifiedFlags[field] = 1
-
- delete = record._emptyFlag or record._deleteFlag
- record.post()
-
- # Adjust the current record if a preceding record is deleted
- if delete and i <= self._currentRecord:
- self._currentRecord -= 1
-
- if delete:
- self._cachedRecords.pop(i)
- self._recordCount -= 1
- else:
- i = i + 1
-
- # Move to record 0 if all preceding records were deleted
- # (or set to -1 if all records were deleted)
- if self._currentRecord < 0:
- if len(self._cachedRecords):
- self._currentRecord = 0
- else:
- self._currentRecord = -1
- if self._currentRecord >= self._recordCount:
- self._currentRecord = self._recordCount - 1
-
-
def _loadNextRecord(self):
if self._cursor:
rs = None
--- 284,289 ----
Index: gnue/common/src/dbdrivers/mxodbc/DBdriver.py
diff -c gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.1
gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.2
*** gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.1 Wed Nov 14 10:10:17 2001
--- gnue/common/src/dbdrivers/mxodbc/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 121,129 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because ODBC_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
ODBC_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 121,126 ----
Index: gnue/common/src/dbdrivers/mysql/DBdriver.py
diff -c gnue/common/src/dbdrivers/mysql/DBdriver.py:1.9
gnue/common/src/dbdrivers/mysql/DBdriver.py:1.10
*** gnue/common/src/dbdrivers/mysql/DBdriver.py:1.9 Sun Nov 11 01:11:02 2001
--- gnue/common/src/dbdrivers/mysql/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 97,105 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because MySQL_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
MySQL_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 97,102 ----
Index: gnue/common/src/dbdrivers/odbc/DBdriver.py
diff -c gnue/common/src/dbdrivers/odbc/DBdriver.py:1.10
gnue/common/src/dbdrivers/odbc/DBdriver.py:1.11
*** gnue/common/src/dbdrivers/odbc/DBdriver.py:1.10 Wed Nov 14 19:12:37 2001
--- gnue/common/src/dbdrivers/odbc/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 185,233 ****
GDebug.printMesg(5, 'ResultSet created')
-
- # Post changes to the database
- def post(self, foreign_keys={}):
- # post our changes
- self._update_cursor = self._dataObject._dataConnection.cursor()
-
- currentRecord = self._currentRecord
-
- i = 0
- while i < len(self._cachedRecords):
-
- record = self._cachedRecords[i]
- for field in foreign_keys.keys():
- record._fields[field] = foreign_keys[field]
- # Some DBs will throw an exception if you update a Primary Key
- # (even if you are updating to the same value)
- if record._insertFlag:
- record._modifiedFlags[field] = 1
-
- delete = record._emptyFlag or record._deleteFlag
- record.post()
-
- # Adjust the current record if a preceding record is deleted
- if delete and i <= self._currentRecord:
- self._currentRecord -= 1
-
- if delete:
- self._cachedRecords.pop(i)
- self._recordCount -= 1
- else:
- i = i + 1
-
- # Move to record 0 if all preceding records were deleted
- # (or set to -1 if all records were deleted)
- if self._currentRecord < 0:
- if len(self._cachedRecords):
- self._currentRecord = 0
- else:
- self._currentRecord = -1
- if self._currentRecord >= self._recordCount:
- self._currentRecord = self._recordCount - 1
-
-
def _loadNextRecord(self):
if self._cursor:
rs = None
--- 185,190 ----
Index: gnue/common/src/dbdrivers/oracle/DBdriver.py
diff -c gnue/common/src/dbdrivers/oracle/DBdriver.py:1.12
gnue/common/src/dbdrivers/oracle/DBdriver.py:1.13
*** gnue/common/src/dbdrivers/oracle/DBdriver.py:1.12 Sun Nov 11 01:11:03 2001
--- gnue/common/src/dbdrivers/oracle/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 199,207 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because Oracle_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
Oracle_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 199,204 ----
Index: gnue/common/src/dbdrivers/sapdb/DBdriver.py
diff -c gnue/common/src/dbdrivers/sapdb/DBdriver.py:1.5
gnue/common/src/dbdrivers/sapdb/DBdriver.py:1.6
*** gnue/common/src/dbdrivers/sapdb/DBdriver.py:1.5 Sun Nov 4 17:22:35 2001
--- gnue/common/src/dbdrivers/sapdb/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 112,120 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because SAP_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
SAP_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 112,117 ----
Index: gnue/common/src/dbdrivers/sqlrelay/DBdriver.py
diff -c gnue/common/src/dbdrivers/sqlrelay/DBdriver.py:1.2
gnue/common/src/dbdrivers/sqlrelay/DBdriver.py:1.3
*** gnue/common/src/dbdrivers/sqlrelay/DBdriver.py:1.2 Sun Nov 11 01:11:03 2001
--- gnue/common/src/dbdrivers/sqlrelay/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 118,126 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because SQLRelay_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
SQLRelay_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 118,123 ----
Index: gnue/common/src/dbdrivers/sybase/DBdriver.py
diff -c gnue/common/src/dbdrivers/sybase/DBdriver.py:1.4
gnue/common/src/dbdrivers/sybase/DBdriver.py:1.5
*** gnue/common/src/dbdrivers/sybase/DBdriver.py:1.4 Thu Nov 8 02:55:52 2001
--- gnue/common/src/dbdrivers/sybase/DBdriver.py Thu Jan 10 15:59:18 2002
***************
*** 117,125 ****
DBSIG_DataObject_Object):
def __init__(self):
- # Call DBSIG init first because Sybase_DataObject needs to overwrite
- # some of its values
- DBSIG_DataObject_Object.__init__(self)
Sybase_DataObject.__init__(self)
def _buildQuery(self, conditions={}):
--- 117,122 ----
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.139 gnue/forms/src/GFForm.py:1.140
*** gnue/forms/src/GFForm.py:1.139 Tue Jan 8 22:59:11 2002
--- gnue/forms/src/GFForm.py Thu Jan 10 15:59:18 2002
***************
*** 298,307 ****
def prepQuery(self):
message = None
! for block in self._blockList:
! if not block.isSaved():
! message = GConfig.get('_msgNOTSAVED')
! return message
for block in self._blockList:
block.processRollback()
--- 298,308 ----
def prepQuery(self):
message = None
! if self._currentBlock.mode != 'query':
! for block in self._blockList:
! if not block.isSaved():
! message = GConfig.get('_msgNOTSAVED')
! return message
for block in self._blockList:
block.processRollback()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue common/src/GConditions.py common/src/GData...,
James Thompson <=