Mercurial > hg > MPIWGWeb
changeset 54:4600e31a0431
Merge with 1ed79b33200c4c4879e3dc314744451eef083902
| author | dwinter |
|---|---|
| date | Tue, 30 Apr 2013 16:35:52 +0200 |
| parents | e718d9a72f19 (diff) 1ed79b33200c (current diff) |
| children | 12cb73494367 |
| files | MPIWGProjects.py MPIWGRoot.py zpt/MPIWGProject_index.zpt zpt/MPIWGProject_newfile.zpt zpt/MPIWGProject_versionManageForm.zpt zpt/edit_MPIWGBasis.zpt |
| diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/MPIWGProjects.py Tue Apr 30 16:00:56 2013 +0200 +++ b/MPIWGProjects.py Tue Apr 30 16:35:52 2013 +0200 @@ -1658,7 +1658,9 @@ # cached HashTree with project hierarchy _v_projectTree = None - + + + def getProjectTree(self): """Return the project hierarchy tree (and cache it). @@ -1960,6 +1962,7 @@ return fulllog + def manage_addMPIWGProjectFolderForm(self): """form for adding a MPIWGProjectFolder"""
--- a/MPIWGRoot.py Tue Apr 30 16:00:56 2013 +0200 +++ b/MPIWGRoot.py Tue Apr 30 16:35:52 2013 +0200 @@ -681,7 +681,7 @@ rss+=linkStr%obj[3].getId() rss+="""</item>""" if hasattr(obj[3],'publicationList'): - rss+="""<item>""" + rss+="""<item>""" rss+=linkStr%(obj[3].getId()+"/publicationList"); rss+="""</item>""" rss+="""</channel>
--- a/MPIWGStaff.py Tue Apr 30 16:00:56 2013 +0200 +++ b/MPIWGStaff.py Tue Apr 30 16:35:52 2013 +0200 @@ -1609,6 +1609,7 @@ pubs=[] for selPub in selPubs: + logging.debug("searchFor:%s"%selPub.escidocid) pubs.append((selPub.escidocid,self.mpiwgPubman.getEntryFromPubman(selPub.escidocid))) return pubs @@ -1712,7 +1713,7 @@ """hole publications aus der datenbank""" - query="select * from pubmanbiblio where key_main = %s order by priority" + query="select * from pubmanbiblio where lower(key_main) = lower(%s) order by priority DESC" return self.executeZSQL(query,[self.getKey()])