[Mpuls-commits] r847 - in wasko/branches/2.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-25 18:38:53 +0100 (Mon, 25 Jan 2010)
New Revision: 847

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/CaseBase.py
Log:
* waskaweb/controllers/CaseBase.py
(CasebaseController._getRenderdFormElements)
(CasebaseController._getFormNavigation)
(CasebaseController._getFormdata): Removed. Unused.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-25 17:36:18 UTC (rev 846)
+++ wasko/branches/2.0/ChangeLog	2010-01-25 17:38:53 UTC (rev 847)
@@ -1,5 +1,12 @@
 2010-01-25  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/CaseBase.py
+	(CasebaseController._getRenderdFormElements)
+	(CasebaseController._getFormNavigation)
+	(CasebaseController._getFormdata): Removed. Unused.
+
+2010-01-25  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/CaseBase.py: Remove commented out code
 
 2010-01-25  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/CaseBase.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/CaseBase.py	2010-01-25 17:36:18 UTC (rev 846)
+++ wasko/branches/2.0/waskaweb/controllers/CaseBase.py	2010-01-25 17:38:53 UTC (rev 847)
@@ -60,56 +60,6 @@
         if self.navigation: return self.navigation
         redirect_to(h.url_for(controller='/case_overview'))
 
-    def _getRenderdFormElements(self, ti, ds_id, page_id=None, ro_mode=False, no_data=False):
-        navigation        = self._getFormNavigation(selected_key=ti.key)
-        real_id           = ds_id
-
-        
-        #formdata, warnings  = self._getFormdata(ti, real_id, no_data)
-        #vr                = ViewRenderer(formdata, ro_mode)
-        #content           = vr.renderView(
-        #    str(ti.key), 
-        #    ds_id,
-        #    showNext = not ti.nextKey() is None)
-        warnings = "Warnings"
-        content  = "Inhalt"
-        return (content, navigation, warnings)
-
-    def _getFormNavigation(self,selected_key=None):
-        case = session.get('case')
-        # TODO: In the following situation: Fresh login, no case selected.
-        # select an appointment from blackboard. Find out why we need to get
-        # the navigation tree from the session again. I thought that this is
-        # alreday done in the _before_ method of this controller. 
-        self.navigation = session.get('navigation.tree')
-        if not case or not self.navigation:
-            redirect_to(h.url_for(controller='/case_overview'))
-        errors = case.getFormErrors()
-        error_pages = set([err.page for err in errors.itervalues()])
-        file_cache  = FileCache()
-        return self.navigation.render(selected_key, file_cache, error_pages)
-
-    def _getFormdata(self, treeItem, ds_id, no_data=False):
-        case = session.get('case')
-        if not case:
-            redirect_to(controller="/case_overview")
-        doc  = g.formedTree
-        help = g.helpData
-        pagestore = doc.getPageStore(treeItem.name, ds_id, no_data=no_data)
-        page     = doc.findByClassAndName(PageNode, treeItem.name)
-        warnings = doc.warningsOnPage(page, ds_id)
-
-        form_errors = case.getFormErrors()
-        formdata = FormDataImpl(
-            FileCache(),
-            help     = help, 
-            page     = pagestore, 
-            errors   = form_errors,
-            warnings = warnings,
-            nc       = [page],
-            formed   = g.formedTree)
-        return (formdata, warnings)
-
     def _setState(self, id, state):
         id      = self._checkInt(id)
         state   = self._checkInt(state)