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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-25 18:21:57 +0100 (Mon, 25 Jan 2010)
New Revision: 843

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/case.py
Log:
* waskaweb/controllers/case.py: Remvoed commented out code


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-25 17:03:24 UTC (rev 842)
+++ wasko/branches/2.0/ChangeLog	2010-01-25 17:21:57 UTC (rev 843)
@@ -1,5 +1,9 @@
 2010-01-25  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/case.py: Remvoed commented out code
+
+2010-01-25  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/controllers/rg_aid.py,
 	waskaweb/tests/functional/test_rg_aid.py: Removed. Not used
 	anymore.

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-25 17:03:24 UTC (rev 842)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-25 17:21:57 UTC (rev 843)
@@ -336,18 +336,6 @@
         c.print_form = "digest" # Which page to open in popup on printing?
         return render('/casemanagement/digest.mako')
 
-    #@checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
-    #def printout(self, ds_id, page_id, form=None):
-    #    ds_id   = self._checkInt(ds_id)
-    #    page_id = self._checkInt(page_id)
-    #    c.print_version = 1
-    #    if form == "digest":
-    #        return self.digest(ds_id)
-    #    elif form == "show":
-    #        return self.show(ds_id, page_id)
-    #    else:
-    #        raise HTTPNotFound()
-
     @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
     def printdigest(self, id):
         id = self._checkInt(id)
@@ -374,28 +362,6 @@
         session.save()
         return render('/formularpage/formular.mako')
 
-        #id = self._checkInt(id)
-        #empty = self._checkBool(empty)
-        #case = self._loadCase(id)
-        #formular = []
-        #c.print_version = 1
-        ## First page is print version of the digest ()
-        #c.digest = case.getDigest(empty)
-        #digest = render('/casemanagement/digest_body.mako')
-        #formular.append(unicode(digest, 'utf-8'))
-        ## append pagebreak
-        #formular.append('<span style="page-break-after:always"></span>')
-        #for ti in self.getNavigation().getAllItems():
-        #    content, navigation, warnings = self._getRenderdFormElements(ti, id, ro_mode=True, no_data=empty)
-        #    formular.append(u"".join(
-        #        [u'<h%d>%s</h%d>' % (min(i+1, 4), escape(s), min(i+1,4)) for i, s in enumerate(ti.pureHeaders())]))
-        #    if not ti.children: #Only add leaves
-        #        formular.append(content)
-        #c.formular = "<br>".join(formular)
-        #c.page_id = None
-        #page = render('/casemanagement/formular.mako')
-        #return page
-
     @checkRole('cm_ka')
     def new(self):
         session_case = SessionCase()
@@ -637,63 +603,6 @@
         if page_id is None: raise HTTPNotFound()
         return self.select_item(page_id)
 
-    #@checkRole('cm_ka')
-    #def save(self):
-    #    case_session = session.get('case')
-    #    try:
-    #        ti = self.getNavigation().getTreeItem(request.params["page"])
-    #    except:
-    #        ti = None
-
-    #    if ti is None:
-    #        redirect_to(controller="/case_overview")
-
-    #    # If we edit page_1 we better update the infofield because the names
-    #    # may have been edited
-    #    if ti.name == "page-0":
-    #        try:
-    #            case_session.last_name     = request.params.get("name")
-    #            case_session.first_name    = request.params.get("vorname")
-    #            case_session.first_meeting = request.params.get("erstgespraech")
-    #            case_session.knr           = request.params.get("fn")
-    #            session.save()
-    #        except KeyError:
-    #            print >> sys.stderr, "Error! Could not update Infofield"
-
-    #    # Get old formerrors, save data and store new formdata
-    #    old_errors = case_session.getFormErrors()
-    #    ds_id = request.params["ds"]
-    #    new_errors, page = self.__save(
-    #        ti.name,
-    #        request.params.dict_of_lists(),
-    #        old_errors,
-    #        ds_id)
-
-    #    if new_errors:
-    #        c.status_msg = h.status_message("Eingabedaten fehlerhaft! Daten wurden nicht gespeichert.")
-    #    else:
-    #        c.status_msg = h.status_message(u'Daten erfolgreich gespeichert. Bitte beachten Sie die <a href="/case/showhelp/datenschutz_veraenderte_daten" target="_blank">Hinweise zur Datenschutz.</a>')
-
-    #    case_session.setFormErrors(new_errors)
-    #    session.save()
-
-    #    # Only proceed to next page if the page does not contain errors
-    #    if request.params.get('__formular_next') \
-    #        and not h.hasErrorsOnPage(case_session.page_id):
-    #        nti = ti.nextKey()
-    #        if not nti is None:
-    #            ti = nti
-    #            ti.unfold()
-    #    return self.edit(ds_id, ti.key)
-
-    #def __save(self, pageName, params, old_errors, ds_id):
-    #    # fetch dataset if valid
-    #    document = g.formedTree
-    #    page = document.getPageStore(pageName, int(ds_id))
-    #    page.setId(ds_id)
-    #    result = page.save(params, old_errors, document)
-    #    return result, page
-
     @checkRole('cm_ka')
     def importCase(self):
         return render('/casemanagement/upload.mako')