[Mpuls-commits] r845 - in wasko/branches/2.0: . waskaweb/controllers
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Jan 25 18:34:26 CET 2010
Author: bh
Date: 2010-01-25 18:34:25 +0100 (Mon, 25 Jan 2010)
New Revision: 845
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/waskaweb/controllers/case.py
wasko/branches/2.0/waskaweb/controllers/caselifetime.py
wasko/branches/2.0/waskaweb/controllers/statement.py
Log:
* waskaweb/controllers/statement.py,
waskaweb/controllers/caselifetime.py,
waskaweb/controllers/case.py: Do not set c.form_navigation
anywhere. It's not used.
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-01-25 17:26:48 UTC (rev 844)
+++ wasko/branches/2.0/ChangeLog 2010-01-25 17:34:25 UTC (rev 845)
@@ -1,5 +1,12 @@
2010-01-25 Bernhard Herzog <bh at intevation.de>
+ * waskaweb/controllers/statement.py,
+ waskaweb/controllers/caselifetime.py,
+ waskaweb/controllers/case.py: Do not set c.form_navigation
+ anywhere. It's not used.
+
+2010-01-25 Bernhard Herzog <bh at intevation.de>
+
* waskaweb/controllers/case.py: Removed commented out code
2010-01-25 Bernhard Herzog <bh at intevation.de>
Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py 2010-01-25 17:26:48 UTC (rev 844)
+++ wasko/branches/2.0/waskaweb/controllers/case.py 2010-01-25 17:34:25 UTC (rev 845)
@@ -332,7 +332,6 @@
c.canceled = case.getState().isCmCanceled()
#ti = self.getNavigation().getTreeItem('0')
#if not ti: return '404'
- c.form_navigation = self._getFormNavigation()
c.print_form = "digest" # Which page to open in popup on printing?
return render('/casemanagement/digest.mako')
@@ -674,7 +673,6 @@
c.user_list = ulist.getUserList(filter3)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
return render('/casemanagement/organisation.mako')
@checkRole('admin_ka')
@@ -714,7 +712,6 @@
id = self._checkInt(id)
case = self._loadCase(id)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
c.remindlist = CaseReminderOverview(id)
c.appointmentlist = CaseAppointmentOverview(id)
return render('/casemanagement/appointments.mako')
@@ -724,7 +721,6 @@
id = self._checkInt(id)
case = self._loadCase(id)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
c.print_version = 1
logbook = Logbook()
logbook.loadById(id)
@@ -739,7 +735,6 @@
id = self._checkInt(id)
case = self._loadCase(id)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
logbook = Logbook()
logbook.loadById(id, sort_field, sort_order)
c.logbook = logbook
@@ -772,7 +767,6 @@
c.nachbetreuung_geplant = nbtr not in [1,-1,-3] and abbr != 3
c.global_warnings = g.formedTree.linksToGlobalWarnings(id, navigation, link)
- c.form_navigation = self._getFormNavigation()
return render('/casemanagement/phase.mako')
@checkRole(('cm_ka'))
@@ -825,7 +819,6 @@
action='phase', \
id=case.id)
- #c.form_navigation = self._getFormNavigation()
return render('/casemanagement/dialogs/success_set_phase.mako')
except formencode.Invalid, error:
c.form_result = error.value
@@ -846,7 +839,6 @@
id = self._checkInt(id)
c.ds_id = id
c.entry = entry
- c.form_navigation = self._getFormNavigation()
c.form_errors = {}
form = render('/logbook/new.mako')
return formencode.htmlfill.render(unicode(form, 'utf-8'), \
@@ -870,7 +862,6 @@
id = self._checkInt(id)
c.ds_id = id
c.entry = entry
- c.form_navigation = self._getFormNavigation()
c.form_errors = {}
form = render('/logbook/new.mako')
return formencode.htmlfill.render(unicode(form, 'utf-8'), \
@@ -888,7 +879,6 @@
try:
c.ds_id = session['case'].id
- c.form_navigation = self._getFormNavigation()
form_result = validator.to_python(request.params)
except formencode.Invalid, error:
c.form_result = error.value
@@ -902,7 +892,6 @@
#if checker.hasErrors():
# c.ds_id = session['case'].id
# c.entry = checker.getLogbookEntry()
- # c.form_navigation = self._getFormNavigation()
# c.form_errors = checker.getErrors()
try:
@@ -934,13 +923,11 @@
return render('/logbook/dialogs/failed_show_logbook_entry.mako')
c.entry = entry
- c.form_navigation = self._getFormNavigation()
return render('/logbook/show.mako')
@checkRole('cm_ka')
def editLogbookEntry(self, id):
id = self._checkInt(id)
- c.form_navigation = self._getFormNavigation()
c.form_errors = {}
entry_data = {}
try:
@@ -970,7 +957,6 @@
def saveLogbookEntry(self):
params = request.params
id = self._checkInt(params.getone('id'))
- c.form_navigation = self._getFormNavigation()
checker = LogbookEntryChecker(params, check_case_id=False)
validator = EditLogbookForm()
@@ -987,7 +973,6 @@
errors=c.form_errors)
#if checker.hasErrors():
- # c.form_navigation = self._getFormNavigation()
# c.errors = checker.getErrors()
# c.entry = checker.getLogbookEntry()
# c.entry.setId(id)
@@ -1012,7 +997,6 @@
def deleteLogbookEntry(self, id, confirmed=False):
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
- c.form_navigation = self._getFormNavigation()
if confirmed == 1:
try:
Logbook().deleteEntryById(int(id))
@@ -1040,7 +1024,6 @@
id = self._checkInt(id)
app = factory.loadById(id)
c.appointment = app
- c.form_navigation = self._getFormNavigation()
return render('/casemanagement/showAppointment.mako')
@checkRole(('cm_ka'))
@@ -1061,7 +1044,6 @@
c.form_errors = {}
c.appointment = app
- c.form_navigation = self._getFormNavigation()
form = render('/casemanagement/editAppointment.mako')
return formencode.htmlfill.render(unicode(form, 'utf-8'), \
defaults=c.form_result, \
@@ -1087,7 +1069,6 @@
action='appointments', \
id=appointment.case_id)
- c.form_navigation = self._getFormNavigation()
return render('/casemanagement/dialogs/success_edit_appointment.mako')
except formencode.Invalid, error:
c.form_result = error.value
@@ -1107,7 +1088,6 @@
confirmed = self._checkBool(confirmed)
factory = CaseAppointmentFactory()
appointment = factory.loadById(id)
- c.form_navigation = self._getFormNavigation()
if confirmed == 1:
if appointment.delete():
c.success_for = DELETE_APPOINT_NOTIFICATION_SUCCESS
@@ -1132,7 +1112,6 @@
id = self._checkInt(id)
case = self._loadCase(id)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
c.form_errors = {}
c.form_result = {}
cd = datetime.now()
@@ -1148,7 +1127,6 @@
id = self._checkInt(id)
case = self._loadCase(id)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
c.form_errors = {}
c.form_result = {}
cd = datetime.now()
@@ -1179,7 +1157,6 @@
c.url_ok = h.url_for(controller='/case', \
action='appointments', \
id=appointment.case_id)
- c.form_navigation = self._getFormNavigation()
return render('/casemanagement/dialogs/success_create_appointment.mako')
except formencode.Invalid, error:
@@ -1198,7 +1175,6 @@
id = self._checkInt(id)
c.ds_id = id
case = self._loadCase(id)
- c.form_navigation = self._getFormNavigation()
c.files = case.getDocuments()
return render('/documents/case_overview.mako')
@@ -1207,7 +1183,6 @@
id = self._checkInt(id)
case = self._loadCase(id)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
return render('/documents/case_new.mako')
@checkRole('cm_ka')
@@ -1280,7 +1255,6 @@
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
if confirmed == 1:
case = self._setState(id, 1)
c.url_ok = h.url_for(controller="/case", action="organisation", id=id)
@@ -1300,7 +1274,6 @@
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
c.ds_id = id
- c.form_navigation = self._getFormNavigation()
if confirmed == 1:
case = self._setState(id, 2)
c.url_ok = h.url_for(controller="/case", action="organisation", id=id)
@@ -1359,7 +1332,6 @@
confirmed = self._checkBool(confirmed)
c.ds_id = id
case = load_case(id)
- c.form_navigation = self._getFormNavigation()
# Check if the case is in a consistent state (all required fields
# are filled)
if (not case.getState().phasesAreConsistent() or not case.getState().phasesAreCompleted()) and case.isYoungerThan(INCONSISTENCY_CHECK_AFTER):
@@ -1395,7 +1367,6 @@
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
c.ds_id = id
- #c.form_navigation = self._getFormNavigation()
# Check if the case is in a consistent state (all required fields
# are filled also check if the phase is finished.)
case = self._loadCase(id)
Modified: wasko/branches/2.0/waskaweb/controllers/caselifetime.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/caselifetime.py 2010-01-25 17:26:48 UTC (rev 844)
+++ wasko/branches/2.0/waskaweb/controllers/caselifetime.py 2010-01-25 17:34:25 UTC (rev 845)
@@ -231,7 +231,6 @@
c.form_errors = {}
c.form_result = {}
checkcase()
- c.form_navigation = self._getFormNavigation()
try:
if c.num_wiederaufnahme >= 1:
last_date = c.casedata.getData('cm_wiederauf_datum_bis_1')
@@ -275,12 +274,10 @@
return self.abortAction()
else:
pass
- c.form_navigation = self._getFormNavigation()
return render('/caselifetime/overview.mako')
def abortcase(self, id, confirmed='0'):
checkcase()
- c.form_navigation = self._getFormNavigation()
if confirmed == '1':
# mark case for deletion
factory = CaseFactory()
@@ -299,7 +296,6 @@
def abortAction(self):
checkcase()
- c.form_navigation = self._getFormNavigation()
form_result = {}
form_errors = {}
return self.abortcase(0)
@@ -309,7 +305,6 @@
def extraTimeAction(self):
checkcase()
- c.form_navigation = self._getFormNavigation()
form_result = {}
form_errors = {}
@@ -337,7 +332,6 @@
def renew_ok(self, id, confirmed='0'):
checkcase()
- c.form_navigation = self._getFormNavigation()
if confirmed == '1':
data = {}
new_case = None
@@ -373,7 +367,6 @@
def renew_notok(self, id, confirmed='0'):
checkcase()
- c.form_navigation = self._getFormNavigation()
if confirmed == '1':
data = {}
new_case = None
@@ -397,7 +390,6 @@
def reopen_ok(self, id, confirmed='0'):
checkcase()
- c.form_navigation = self._getFormNavigation()
if confirmed == '1':
data = {}
try:
@@ -449,7 +441,6 @@
def reopen_notok(self, id, confirmed='0'):
checkcase()
- c.form_navigation = self._getFormNavigation()
data = {}
if confirmed == '1':
try:
@@ -473,7 +464,6 @@
def reopenAction(self):
checkcase()
- c.form_navigation = self._getFormNavigation()
form_result = {}
form_errors = {}
@@ -512,7 +502,6 @@
def renewAction(self):
checkcase()
- c.form_navigation = self._getFormNavigation()
validator = RenewFormValidator()
form_result = {}
form_errors = {}
Modified: wasko/branches/2.0/waskaweb/controllers/statement.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/statement.py 2010-01-25 17:26:48 UTC (rev 844)
+++ wasko/branches/2.0/waskaweb/controllers/statement.py 2010-01-25 17:34:25 UTC (rev 845)
@@ -79,7 +79,6 @@
@checkRole('cm_ka')
def listStatements(self, id):
- c.form_navigation = self._getFormNavigation()
return render('statement/list_statements.mako')
@checkRole('cm_ka')
@@ -102,7 +101,6 @@
def setPrivacyStatement(self, id):
id = self._checkInt(id)
case = self._loadCase(id)
- c.form_navigation = self._getFormNavigation()
c.ds_id = id
c.targeturl = h.url_for(controller="/case", action="digest", id=id)
return render('statement/edit.mako')
@@ -113,7 +111,6 @@
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
case = self._loadCase(id)
- c.form_navigation = self._getFormNavigation()
if confirmed:
try:
statement = case.getPrivacyStatement()
@@ -151,7 +148,6 @@
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
case = self._loadCase(id)
- c.form_navigation = self._getFormNavigation()
if (not case.getState().phasesAreConsistent() or not case.getState().phasesAreCompleted()) and case.isYoungerThan(INCONSISTENCY_CHECK_AFTER):
c.notification_for = MARK_EE_DECLINE_INCOMPLETE_PHASE_FAILED
if case.getState().getPhase() in (CLEAR_START, CLEAR_ENDE):
More information about the Mpuls-commits
mailing list