version 1.1.2.30, 2011/02/23 17:43:07
|
version 1.1.2.31, 2011/05/18 10:52:29
|
Line 792 class MPIWGRoot(ZSQLExtendFolder):
|
Line 792 class MPIWGRoot(ZSQLExtendFolder):
|
if ignoreEntries is None: |
if ignoreEntries is None: |
ignoreEntries = [] |
ignoreEntries = [] |
|
|
ignoreEntries.append('current_work') # TODO:updatecurrent work |
#ignoreEntries.append('current_work') # TODO:updatecurrent work |
logging.debug("updatePersonEntry: data=%s ignoreEntries=%s"%(repr(data),repr(ignoreEntries))) |
logging.debug("updatePersonEntry: data=%s ignoreEntries=%s"%(repr(data),repr(ignoreEntries))) |
|
|
if data['date_to']=="": # wenn date_to leer |
if data['date_to']=="": # wenn date_to leer |
Line 884 class MPIWGRoot(ZSQLExtendFolder):
|
Line 884 class MPIWGRoot(ZSQLExtendFolder):
|
ret+="<table border='1'>" |
ret+="<table border='1'>" |
for iE in displayIgnored: |
for iE in displayIgnored: |
ret+="<tr><td>%s</td><td>%s</td><td>%s</td>"%(iE[0].encode('utf-8'),iE[1].encode('utf-8'),iE[2].encode('utf-8')) |
ret+="<tr><td>%s</td><td>%s</td><td>%s</td>"%(iE[0].encode('utf-8'),iE[1].encode('utf-8'),iE[2].encode('utf-8')) |
ret+="</tabel>" |
ret+="</table>" |
|
|
self.updatePersonEntry(resultSet[conflict],ignoreEntries=ignoreEntries) |
self.updatePersonEntry(resultSet[conflict],ignoreEntries=ignoreEntries) |
|
|