[Mpuls-commits] r3462 - in jmd/trunk: . jmdstrukturweb/lib jmdweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-27 12:17:41 +0200 (Fri, 27 Aug 2010)
New Revision: 3462

Removed:
   jmd/trunk/jmdstrukturweb/lib/app_globals.py
   jmd/trunk/jmdweb/lib/app_globals.py
Modified:
   jmd/trunk/ChangeLog
Log:
* jmdweb/lib/app_globals.py, jmdstrukturweb/lib/app_globals.py:
Removed. The base version includes all of the required
functionality now.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-08-27 10:15:04 UTC (rev 3461)
+++ jmd/trunk/ChangeLog	2010-08-27 10:17:41 UTC (rev 3462)
@@ -1,3 +1,9 @@
+2010-08-27  Bernhard Herzog  <bh at intevation.de>
+
+	* jmdweb/lib/app_globals.py, jmdstrukturweb/lib/app_globals.py:
+	Removed. The base version includes all of the required
+	functionality now.
+
 2010-08-25  Bernhard Herzog  <bh at intevation.de>
 
 	* jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.po: Update with the

Deleted: jmd/trunk/jmdstrukturweb/lib/app_globals.py
===================================================================
--- jmd/trunk/jmdstrukturweb/lib/app_globals.py	2010-08-27 10:15:04 UTC (rev 3461)
+++ jmd/trunk/jmdstrukturweb/lib/app_globals.py	2010-08-27 10:17:41 UTC (rev 3462)
@@ -1,25 +0,0 @@
-"""Extend the MPuls app_globals for WASKO"""
-
-from mpulsweb.lib.app_globals import Globals as MPulsGlobals
-
-from jmdstrukturweb.model.case import Case, CaseFactory
-from jmdstrukturweb.lib.search import CaseSearch
-
-
-class Globals(MPulsGlobals):
-
-    """This Globals class extends the base class with the following objects:
-
-       case_factory -- The factory to use to instantiate Case objects
-    """
-
-    def __init__(self):
-        MPulsGlobals.__init__(self)
-        self._init_case()
-
-    def _init_case(self):
-        fields = self.mpuls_config.get("case", "fields")
-        Case.set_fields(fields)
-        self.case_factory = CaseFactory(Case)
-        self.case_search  = CaseSearch
-        self.case = Case

Deleted: jmd/trunk/jmdweb/lib/app_globals.py
===================================================================
--- jmd/trunk/jmdweb/lib/app_globals.py	2010-08-27 10:15:04 UTC (rev 3461)
+++ jmd/trunk/jmdweb/lib/app_globals.py	2010-08-27 10:17:41 UTC (rev 3462)
@@ -1,25 +0,0 @@
-"""Extend the MPuls app_globals for WASKO"""
-
-from mpulsweb.lib.app_globals import Globals as MPulsGlobals
-
-from jmdweb.model.case import Case, CaseFactory
-from jmdweb.lib.search import CaseSearch
-
-
-class Globals(MPulsGlobals):
-
-    """This Globals class extends the base class with the following objects:
-
-       case_factory -- The factory to use to instantiate Case objects
-    """
-
-    def __init__(self):
-        MPulsGlobals.__init__(self)
-        self._init_case()
-
-    def _init_case(self):
-        fields = self.mpuls_config.get("case", "fields")
-        Case.set_fields(fields)
-        self.case_factory = CaseFactory(Case)
-        self.case_search  = CaseSearch
-        self.case = Case