[Mpuls-commits] r1735 - in wasko/branches/2.0: . jmdweb/templates mpulsweb/templates mpulsweb/templates/phase

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-24 11:48:28 +0100 (Wed, 24 Feb 2010)
New Revision: 1735

Added:
   wasko/branches/2.0/mpulsweb/templates/phase/
Removed:
   wasko/branches/2.0/jmdweb/templates/phase/
Modified:
   wasko/branches/2.0/ChangeLog
Log:
Moved templates for phases to mpulsbase


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-24 10:46:42 UTC (rev 1734)
+++ wasko/branches/2.0/ChangeLog	2010-02-24 10:48:28 UTC (rev 1735)
@@ -8,6 +8,10 @@
 	* jmdweb/public/formed/formedtree.xml: Added rules to formedtree
 	* mpulsweb/lib/config.py: Added configuration for fields (and) rules
 	  definition for phases
+	* waskaweb/model/phase.py,
+	  mpulsweb/model/phase.py: Moved phasemodel to mpulsbase
+	* waskaweb/controllers/phase.py: Import PhaseFactory from mpulsbase 
+	* mpulsweb/controllers/phase.py: Import PhaseFactory from mpulsbase 
 
 2010-02-24  Bernhard Herzog  <bh at intevation.de>
 

Copied: wasko/branches/2.0/mpulsweb/templates/phase (from rev 1729, wasko/branches/2.0/jmdweb/templates/phase)


Property changes on: wasko/branches/2.0/mpulsweb/templates/phase
___________________________________________________________________
Name: svn:mergeinfo
   +