Mercurial > hg > MPIWGWeb
comparison MPIWGProjects.py @ 183:8bbf8900273d
more utf8ify for member keys again :-(
author | casties |
---|---|
date | Thu, 13 Jun 2013 17:57:37 +0200 |
parents | 136b2d5b3e3d |
children | 90d44df497a6 |
comparison
equal
deleted
inserted
replaced
181:a743e22a155a | 183:8bbf8900273d |
---|---|
1831 if not memberKey or not isinstance(memberKey, basestring): | 1831 if not memberKey or not isinstance(memberKey, basestring): |
1832 logging.error("updateProjectMembers: not a valid member key: %s" % repr(memberKey)) | 1832 logging.error("updateProjectMembers: not a valid member key: %s" % repr(memberKey)) |
1833 continue | 1833 continue |
1834 | 1834 |
1835 # fill projects_members table | 1835 # fill projects_members table |
1836 self.executeZSQL("insert into projects_members (project_id, member_key) values (%s, %s)", (pid, memberKey)) | 1836 self.executeZSQL("insert into projects_members (project_id, member_key) values (%s, %s)", (pid, utf8ify(memberKey))) |
1837 | 1837 |
1838 | 1838 |
1839 | 1839 |
1840 | 1840 |
1841 def manage_addMPIWGProjectForm(self): | 1841 def manage_addMPIWGProjectForm(self): |
1930 archived = 1 : current projects | 1930 archived = 1 : current projects |
1931 archived = 2 : archived projects | 1931 archived = 2 : archived projects |
1932 """ | 1932 """ |
1933 projects = [] | 1933 projects = [] |
1934 # search project numbers | 1934 # search project numbers |
1935 res = self.executeZSQL("select * from projects_members where lower(member_key) = %s", [key.lower()]) | 1935 res = self.executeZSQL("select * from projects_members where lower(member_key) = %s", [utf8ify(key).lower()]) |
1936 # find projects in folder | 1936 # find projects in folder |
1937 for r in res: | 1937 for r in res: |
1938 p = self.get(r.project_id, None) | 1938 p = self.get(r.project_id, None) |
1939 # check if active | 1939 # check if active |
1940 if p is not None and p.checkActive(active) and p.checkArchived(archived): | 1940 if p is not None and p.checkActive(active) and p.checkArchived(archived): |