[Mpuls-commits] r2032 - wasko/branches/2.0

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-03-19 10:58:53 +0100 (Fri, 19 Mar 2010)
New Revision: 2032

Modified:
   wasko/branches/2.0/ChangeLog
Log:
Updated ChangeLog


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-19 09:58:32 UTC (rev 2031)
+++ wasko/branches/2.0/ChangeLog	2010-03-19 09:58:53 UTC (rev 2032)
@@ -1,3 +1,32 @@
+2010-03-19  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* mpulsweb/controllers/case_overview.py (parseSearchOptions): Added
+	  check if phases are defined.
+	* mpulsweb/lib/config.py: Removed field definition in default config
+	* mpulsweb/lib/search.py (CaseSearch.__get_fields): Check if there are
+	  any additional fields defined to fetch. Fixed SQL syntax error if
+	  no fields are defined. 
+	* mpulsweb/model/case.py (MpulsCaseStandin): Copied from
+	  jmdweb.model.case.
+	* jmdweb/model/case.py (CaseStandin): Deleted. Is now defined in
+	  mpulsweb. 
+	* mpulsweb/model/case.py (MpulsCase.getStandin): New. Copied from
+	  jmdweb. 
+	* jmdweb/model/case.py (Case.getStandin): Deleted. Is now defined in
+	  mpulsweb 
+	* mpulsweb/model/case.py (MpulsCase.delete): New. Copied from
+	  jmdweb. 
+	* jmdweb/model/case.py (Case.delete): Deleted. Is now defined in
+	  mpulsweb 
+	* jmdweb/model/case.py (Case.getId): Deleted. Seems not to be used
+	  anywhere.
+	* jmdweb/model/case.py (Case.setEditor): Only define jmdspecific
+	  behavior, like setting editor name in formular. (Case.getEditor):
+	  Deleted. Defined in mpulsweb now.
+	* jmdweb/model/case.py (Case.getEditor),(setEditor): New. copied from
+	  jmdweb. setEditor only defines transfering the case to the new user.
+	  No setting of names in forms are done. 
+
 2010-03-18  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/controllers/formularpage.py (get_rendered_page): Render
@@ -30,6 +59,7 @@
 	* mpulsweb/lib/renderer.py (ViewRenderer._renderChild): Log a
 	debug message if a child will be ignored unexpectedly.
 
+>>>>>>> .r2029
 2010-03-18  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/config/routing.py: Added new route for new controller to