# HG changeset patch # User casties # Date 1371224169 -7200 # Node ID 16d55695f1c8f662461fe8a0a473ac50baf490db # Parent 71c2d76f09b53e1a2b066dc8eaba51fcb3919cc5 fix updating staff entries through "Update personal homepages". (creating new entries doesn't work) diff -r 71c2d76f09b5 -r 16d55695f1c8 MPIWGRoot.py --- a/MPIWGRoot.py Fri Jun 14 15:49:53 2013 +0200 +++ b/MPIWGRoot.py Fri Jun 14 17:36:09 2013 +0200 @@ -355,8 +355,9 @@ return result,msg - def updatePersonEntry(self,data,ignoreEntries=None): - """update an person entry from data. but ignore all fields in ignore Entries""" + def updatePersonEntry(self,newdata,ignoreEntries=None): + """update an person entry from newdata. but ignore all fields in ignore Entries""" + data = newdata.copy() if ignoreEntries is None: ignoreEntries = [] @@ -364,43 +365,42 @@ logging.debug("updatePersonEntry: data=%s ignoreEntries=%s"%(repr(data),repr(ignoreEntries))) if data['date_to']=="": # wenn date_to leer - data['date_to']="date_none" + data['date_to']=None if data['date_from']=="": # wenn date_fromleer - data['date_from']="date_none" - msg="" - - + data['date_from']=None + #eintragen columns=data.keys() for x in ignoreEntries: logging.debug("updatePersonEntry: ignoring %s"%x) - try: #falls in ignore entries felder sind, die nicht in columns sind, fange den fehler ab - columns.remove(x) - except: - pass + if x in data: + del data[x] + member = self.getStaffFolder().getMember(key = data['key']) + if member is None: + logging.error("updatePersonEntry: member (key=%s) not found!"%repr(data['key'])) + return + + # TODO: change date handling + self.getStaffFolder().executeZSQL("SET DATESTYLE TO 'German'") + member.changeData(data) - insert=[] - for key in columns: - if data[key]=="date_none": # date_none eintrag wird zu null uebersetzt - insert.append('%s=null'%key) - else: - insert.append(""" "%s"=%s"""%(key,self.ZSQLQuote(data[key]))) - - insertStr=",".join(insert) - queryStr="update personal_www SET %s where key='%s'"%(insertStr,data['key']) - self.ZSQLQuery("SET DATESTYLE TO 'German'") - self.ZSQLQuery(queryStr) - - #currentwork - #if not (txt==""): - # queryStr="INSERT INTO current_work (id_main,current,publish) VALUES ('%s','%s','%s')"%(id,txt,txt_p) - # - # self.ZSQLQuery(queryStr) - - return True,msg +# msg="" +# insert=[] +# for key in columns: +# if data[key]=="date_none": # date_none eintrag wird zu null uebersetzt +# insert.append('%s=null'%key) +# else: +# insert.append(""" "%s"=%s"""%(key,self.ZSQLQuote(data[key]))) +# +# insertStr=",".join(insert) +# queryStr="update personal_www SET %s where key='%s'"%(insertStr,data['key']) +# self.ZSQLQuery("SET DATESTYLE TO 'German'") +# self.ZSQLQuery(queryStr) +# +# return True,msg def updatePersonalwww_doIt(self): @@ -415,7 +415,7 @@ # generate the new entry if news and (len(news)>0): - ret+="

Hinzugefügt

" + ret+="

Added

" ret+="" + ret+="

New entries will be visible on the webpage when an email address has been assigned.

" + ret+="" # update if len(conflicts.keys())>0: - ret+="

Änderung des Benutzers übernehmen

" - ret+="

Wenn nötig in Filemaker-db ändern:

" + ret+="

Accepted changes to user entries

" + ret+="

Change Filemaker-db when necessary.

" # konflicte for conflict in conflicts.keys(): @@ -458,9 +458,19 @@ # rest cl=list(conflicts.keys()) + if len(resultSet.keys()) > 0: + ret += "

Updating user entries

" + ret += "" + + ret += "

Done.

" return ret+"" @@ -479,10 +489,7 @@ resultSet=updatePersonalWWW.importFMPXML(uploadfile) news,conflicts=updatePersonalWWW.checkImport(dsn, resultSet) - self.REQUEST.SESSION['personal_www']={} - self.REQUEST.SESSION['personal_www']['resultSet']=resultSet - self.REQUEST.SESSION['personal_www']['news']=news - self.REQUEST.SESSION['personal_www']['conflicts']=conflicts + self.REQUEST.SESSION['personal_www'] = {'resultSet': resultSet, 'news': news, 'conflicts': conflicts} pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','updatePersonalwww_check.zpt')).__of__(self) return pt() diff -r 71c2d76f09b5 -r 16d55695f1c8 MPIWGStaff.py --- a/MPIWGStaff.py Fri Jun 14 15:49:53 2013 +0200 +++ b/MPIWGStaff.py Fri Jun 14 17:36:09 2013 +0200 @@ -20,7 +20,7 @@ from Products.ZDBInterface.ZDBInterfaceFolder import ZDBInterfaceFolder -from SrvTxtUtils import getInt, unicodify, utf8ify +from SrvTxtUtils import getInt, unicodify, utf8ify, sqlName import MPIWGHelper # @@ -587,14 +587,25 @@ #REQUEST.response.redirect(self.REQUEST['HTTP_REFERER']) - def changeData(self,changeSet): + security.declareProtected('View management screens','changeData') + def changeData(self, changeSet): """changes the data in the database, changeset expects field --> value.""" + fields = [] + values = [] for field in changeSet.keys(): if hasattr(self.content, field): logging.debug("Changing: %s"%field) - results = self.folder.executeZSQL("update personal_www set "+field+" = %s where key = %s", [changeSet.get(field),self.getKey().encode('utf-8')]); - logging.debug(results) - + fields.append('"'+sqlName(field)+'" = %s') + values.append(changeSet.get(field)) + + if len(fields) == 0: + return + + query = "update personal_www set " + ', '.join(fields) + " where key = %s" + values.append(self.getKey().encode('utf-8')) + results = self.folder.executeZSQL(query, values) + logging.debug(results) + self.refresh_content() diff -r 71c2d76f09b5 -r 16d55695f1c8 SrvTxtUtils.py --- a/SrvTxtUtils.py Fri Jun 14 15:49:53 2013 +0200 +++ b/SrvTxtUtils.py Fri Jun 14 17:36:09 2013 +0200 @@ -10,10 +10,11 @@ import urllib2 import logging import time +import re import xml.etree.ElementTree as ET -srvTxtUtilsVersion = "1.9.2" +srvTxtUtilsVersion = "1.10.0" map_months = {'en': [u"", u"January", @@ -215,3 +216,23 @@ l1 = int((l - len(ellipsis)) / 2) return "%s%s%s"%(s[:l1],ellipsis,s[-l1:]) + +def sqlName(s, lc=True, more=''): + """returns restricted ASCII-only version of string""" + if s is None: + return "" + + if not isinstance(s, basestring): + # make string object + s = str(s) + + # remove ' + s = s.replace("'","") + # all else -> "_" + s = re.sub('[^A-Za-z0-9_'+more+']','_',s) + if lc: + return s.lower() + + return s + +