Mercurial > p > roundup > code
comparison roundup/cgi/templating.py @ 3049:393f6ab17c07
handle spaces in String index params in batching [SF#1054224]
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Tue, 04 Jan 2005 01:44:29 +0000 |
| parents | 14322134dcef |
| children | 53d1d4e2015c |
comparison
equal
deleted
inserted
replaced
| 3048:d9b4224f955c | 3049:393f6ab17c07 |
|---|---|
| 2018 val = self.group[1] | 2018 val = self.group[1] |
| 2019 l.append(s%(sc+'group', val)) | 2019 l.append(s%(sc+'group', val)) |
| 2020 if filter and self.filter: | 2020 if filter and self.filter: |
| 2021 l.append(s%(sc+'filter', ','.join(self.filter))) | 2021 l.append(s%(sc+'filter', ','.join(self.filter))) |
| 2022 if filterspec: | 2022 if filterspec: |
| 2023 props = self.client.db.getclass(self.classname).getprops() | |
| 2023 for k,v in self.filterspec.items(): | 2024 for k,v in self.filterspec.items(): |
| 2024 if type(v) == type([]): | 2025 if type(v) == type([]): |
| 2025 l.append(s%(k, ','.join(v))) | 2026 if isinstance(props[k], hyperdb.String): |
| 2027 l.append(s%(k, ' '.join(v))) | |
| 2028 else: | |
| 2029 l.append(s%(k, ','.join(v))) | |
| 2026 else: | 2030 else: |
| 2027 l.append(s%(k, v)) | 2031 l.append(s%(k, v)) |
| 2028 if self.search_text: | 2032 if self.search_text: |
| 2029 l.append(s%(sc+'search_text', self.search_text)) | 2033 l.append(s%(sc+'search_text', self.search_text)) |
| 2030 l.append(s%(sc+'pagesize', self.pagesize)) | 2034 l.append(s%(sc+'pagesize', self.pagesize)) |
| 2066 l.append(sc+'pagesize=%s'%self.pagesize) | 2070 l.append(sc+'pagesize=%s'%self.pagesize) |
| 2067 if not specials.has_key('startwith'): | 2071 if not specials.has_key('startwith'): |
| 2068 l.append(sc+'startwith=%s'%self.startwith) | 2072 l.append(sc+'startwith=%s'%self.startwith) |
| 2069 | 2073 |
| 2070 # finally, the remainder of the filter args in the request | 2074 # finally, the remainder of the filter args in the request |
| 2075 props = self.client.db.getclass(self.classname).getprops() | |
| 2071 for k,v in self.filterspec.items(): | 2076 for k,v in self.filterspec.items(): |
| 2072 if not args.has_key(k): | 2077 if not args.has_key(k): |
| 2073 if type(v) == type([]): | 2078 if type(v) == type([]): |
| 2074 l.append('%s=%s'%(k, ','.join(v))) | 2079 if isinstance(props[k], hyperdb.String): |
| 2080 l.append(s%(k, ' '.join(v))) | |
| 2081 else: | |
| 2082 l.append(s%(k, ','.join(v))) | |
| 2075 else: | 2083 else: |
| 2076 l.append('%s=%s'%(k, v)) | 2084 l.append('%s=%s'%(k, v)) |
| 2077 return '%s?%s'%(url, '&'.join(l)) | 2085 return '%s?%s'%(url, '&'.join(l)) |
| 2078 indexargs_href = indexargs_url | 2086 indexargs_href = indexargs_url |
| 2079 | 2087 |