Author: torsten
Date: 2008-09-23 13:14:34 +0200 (Tue, 23 Sep 2008)
New Revision: 189
Modified:
waska/trunk/ChangeLog.txt
waska/trunk/waskaweb/controllers/case_overview.py
waska/trunk/waskaweb/templates/casemanagement/search.mako
Log:
Fixed issue571
Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt 2008-09-23 09:42:42 UTC (rev 188)
+++ waska/trunk/ChangeLog.txt 2008-09-23 11:14:34 UTC (rev 189)
@@ -16,6 +16,14 @@
* waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako,
formed/waska-hilfetexte.xhtml: Added new helptexts
+ Fixed issue571
+
+ * waskaweb/controllers/case_overview.py,
+ waskaweb/templates/casemanagement/search.mako: Search was broken in
+ connection with new search options on phases. If no phase was given
+ the search string includes a whitespace with results in an empty
+ result list for a search.
+
2008-09-22 Torsten Irlaender <torsten.irlaender at intevation.de>
Set Version number to 1.4.0
Modified: waska/trunk/waskaweb/controllers/case_overview.py
===================================================================
--- waska/trunk/waskaweb/controllers/case_overview.py 2008-09-23 09:42:42 UTC (rev 188)
+++ waska/trunk/waskaweb/controllers/case_overview.py 2008-09-23 11:14:34 UTC (rev 189)
@@ -164,7 +164,8 @@
phases = [3,4,5]
if cm_state == 'all':
phases = [-1,0,1,2,3,4,5,6,7]
- search_options.append('%s' % ";".join("phase:%s" % p for p in phases))
+ phases = '%s' % ";".join("phase:%s" % p for p in phases)
+ if phases: search_options.append(phases)
#check build time_interval
year = options.get('year')
Modified: waska/trunk/waskaweb/templates/casemanagement/search.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/search.mako 2008-09-23 09:42:42 UTC (rev 188)
+++ waska/trunk/waskaweb/templates/casemanagement/search.mako 2008-09-23 11:14:34 UTC (rev 189)
@@ -77,12 +77,12 @@
<td width="80" valign="top"><label for="cm_state">CM-Status:</label></td>
<td valign="top">
<select name="cm_state" id="cm_state">
- <option value="none">Keine Auswahl</option>
<option value="all">Alle</option>
<option value="clearing">Clearing</option>
<option value="before">Beratungskunde</option>
<option value="active">CM-Laufend</option>
<option value="finished">CM-Abgeschlossen</option>
+ <option value="none">Keine Auswahl</option>
</select>
</td>
</tr>