[Mpuls-commits] r5512 - in base/trunk/mpulsweb: controllers lib templates templates/administration templates/appointments templates/casebundle templates/casemanagement templates/documents templates/evaluation templates/formularpage templates/logbook templates/phase templates/privacy/dialogs templates/search templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 1 13:33:16 CET 2011
Author: ludwig
Date: 2011-11-01 13:33:12 +0100 (Tue, 01 Nov 2011)
New Revision: 5512
Modified:
base/trunk/mpulsweb/controllers/administration.py
base/trunk/mpulsweb/controllers/annotations.py
base/trunk/mpulsweb/controllers/appointment.py
base/trunk/mpulsweb/controllers/case.py
base/trunk/mpulsweb/controllers/caseappointment.py
base/trunk/mpulsweb/controllers/casedocument.py
base/trunk/mpulsweb/controllers/document.py
base/trunk/mpulsweb/controllers/formularpage.py
base/trunk/mpulsweb/controllers/logbook.py
base/trunk/mpulsweb/controllers/navigation.py
base/trunk/mpulsweb/controllers/phase.py
base/trunk/mpulsweb/controllers/settings.py
base/trunk/mpulsweb/controllers/usersettings.py
base/trunk/mpulsweb/lib/search.py
base/trunk/mpulsweb/templates/administration/show_user_body.mako
base/trunk/mpulsweb/templates/appointments/appointmentlist.mako
base/trunk/mpulsweb/templates/appointments/edit_body.mako
base/trunk/mpulsweb/templates/appointments/overview.mako
base/trunk/mpulsweb/templates/appointments/remindlist_body.mako
base/trunk/mpulsweb/templates/appointments/show.mako
base/trunk/mpulsweb/templates/casebundle/editor.mako
base/trunk/mpulsweb/templates/casebundle/standin.mako
base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako
base/trunk/mpulsweb/templates/casemanagement/appointments.mako
base/trunk/mpulsweb/templates/casemanagement/caselist.mako
base/trunk/mpulsweb/templates/casemanagement/main.mako
base/trunk/mpulsweb/templates/casemanagement/organisation.mako
base/trunk/mpulsweb/templates/casemanagement/overview.mako
base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako
base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
base/trunk/mpulsweb/templates/documents/case_overview.mako
base/trunk/mpulsweb/templates/documents/global_overview.mako
base/trunk/mpulsweb/templates/evaluation/overview.mako
base/trunk/mpulsweb/templates/formularpage/formular.mako
base/trunk/mpulsweb/templates/formularpage/formular_print.mako
base/trunk/mpulsweb/templates/logbook/overview.mako
base/trunk/mpulsweb/templates/logbook/show.mako
base/trunk/mpulsweb/templates/main.mako
base/trunk/mpulsweb/templates/phase/phase.mako
base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
base/trunk/mpulsweb/templates/search/search.mako
base/trunk/mpulsweb/templates/usersettings/show_settings.mako
Log:
Issue 2402: Renaming of old roles.
Rename: admin_ka -> admin, cm_ka->cm, pk_ka->pb
This is a clean-up of the code.
Modified: base/trunk/mpulsweb/controllers/administration.py
===================================================================
--- base/trunk/mpulsweb/controllers/administration.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/administration.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -71,24 +71,24 @@
class AdministrationController(BaseController):
- @checkRole('admin_ka')
+ @checkRole('admin')
def index(self):
return self.overviewUser()
# USER
- @checkRole('admin_ka')
+ @checkRole('admin')
def overviewUser(self):
list = UserListObject()
c.user_overview = list.getUserList()
return render('/administration/overview_user.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def newUser(self):
c.form_errors = {}
c.form_result = {}
return render('/administration/new_user.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def newUserAction(self):
validator = NewUserForm()
c.user_password = None
@@ -113,14 +113,14 @@
c.form_result, c.form_errors,
auto_insert_errors=False)
- @checkRole('admin_ka')
+ @checkRole('admin')
def showUser(self, id=None):
id = self._checkInt(id)
c.uo = UserObject(id)
c.vuo = UserGroup(c.uo.standin)
return render('/administration/show_user.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def editUser(self, id=None):
id = self._checkInt(id)
c.form_errors = {}
@@ -128,7 +128,7 @@
c.uo = UserObject(id)
return render('/administration/edit_user.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def editUserAction(self):
validator = EditUserForm()
try:
@@ -147,7 +147,7 @@
c.form_errors = error.error_dict or {}
return render('/administration/edit_user.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def resetUserPassword(self, id=None, confirmed='0'):
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
@@ -171,7 +171,7 @@
# remaining cases to a another user before deletion. Simply raise an
# error-dialog an cance action.
- #@checkRole('admin_ka')
+ #@checkRole('admin')
#def deleteUser(self, id, confirmed='0'):
# id = self._checkInt(id)
# confirmed = self._checkBool(confirmed)
@@ -337,7 +337,7 @@
redirect_to(controller="/administration", action='overviewUser')
# USERGROUPS
- @checkRole('admin_ka')
+ @checkRole('admin')
def overviewUserGroups(self):
# Get gid of usergroups so we can filter them out.
user = UserListObject()
@@ -347,13 +347,13 @@
c.group_overview = list.getGroupList(filter)
return render('/administration/overview_usergroups.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def newUserGroup(self):
c.form_errors = {}
c.form_result = {}
return render('/administration/new_usergroup.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def newUserGroupAction(self):
factory = UserGroupFactory()
validator = NewUserGroupForm()
@@ -384,7 +384,7 @@
action='overviewUserGroups')
return render('/administration/dialogs/failed_new_usergroup.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def showUserGroup(self, id=None):
factory = UserGroupFactory()
id = self._checkInt(id)
@@ -394,7 +394,7 @@
c.groupmember = groupmember
return render('/administration/show_usergroup.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def editUserGroup(self, id=None):
id = self._checkInt(id)
factory = UserGroupFactory()
@@ -413,7 +413,7 @@
c.form_result, c.form_errors,
auto_insert_errors=False)
- @checkRole('admin_ka')
+ @checkRole('admin')
def editUserGroupAction(self):
validator = EditUserGroupForm()
factory = UserGroupFactory()
@@ -447,7 +447,7 @@
c.form_result, c.form_errors,
auto_insert_errors=False)
- @checkRole('admin_ka')
+ @checkRole('admin')
def deleteUserGroup(self, id, confirmed='0'):
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
Modified: base/trunk/mpulsweb/controllers/annotations.py
===================================================================
--- base/trunk/mpulsweb/controllers/annotations.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/annotations.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -12,7 +12,7 @@
class AnnotationsController(BaseController):
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def help(self, id):
"""Show help for the given id.
The id is first looked up in the formed tree, because its node
@@ -35,7 +35,7 @@
c.annotation_text = text
return render('/annotations/annotation.mako')
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def required(self, id):
nc = g.formedTree.findByName(id)
if not nc:
@@ -46,7 +46,7 @@
' field, and must be filled out')
return render('/annotations/annotation.mako')
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def evaluation(self, id):
nc = g.formedTree.findByName(id)
if not nc:
Modified: base/trunk/mpulsweb/controllers/appointment.py
===================================================================
--- base/trunk/mpulsweb/controllers/appointment.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/appointment.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -47,16 +47,16 @@
class AppointmentController(BaseController):
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def index(self):
redirect_to(action='overview')
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def overview(self):
c.appointmentlist = GlobalAppointmentOverview()
return render('/appointments/overview.mako')
- @checkRole(('admin_ka'))
+ @checkRole(('admin'))
def create(self):
c.form_errors = {}
c.form_result = {}
@@ -68,7 +68,7 @@
return formencode.htmlfill.render(form,
defaults=c.form_defaults)
- @checkRole(('admin_ka'))
+ @checkRole(('admin'))
def createAction(self):
validator = CreateAppointmentForm()
factory = GlobalAppointmentFactory()
@@ -95,13 +95,13 @@
auto_insert_errors=False,
errors=c.form_errors)
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def show(self, id):
factory = GlobalAppointmentFactory()
c.appointment = factory.loadById(id)
return render('/appointments/show.mako')
- @checkRole(('admin_ka'))
+ @checkRole(('admin'))
def edit(self, id):
id = self._checkInt(id)
factory = GlobalAppointmentFactory()
@@ -122,7 +122,7 @@
auto_insert_errors=False,
errors=c.form_errors)
- @checkRole(('admin_ka'))
+ @checkRole(('admin'))
def editAction(self):
validator = CreateAppointmentForm()
factory = GlobalAppointmentFactory()
@@ -149,7 +149,7 @@
auto_insert_errors=False,
errors=c.form_errors)
- @checkRole(('admin_ka'))
+ @checkRole(('admin'))
def delete(self, id, confirmed=False):
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
@@ -173,7 +173,7 @@
c.url_no = url_for(controller='/appointment', action='overview')
return render('/appointments/dialogs/confirm.mako')
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def save(self):
return render('/appointments/new.mako')
Modified: base/trunk/mpulsweb/controllers/case.py
===================================================================
--- base/trunk/mpulsweb/controllers/case.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/case.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -611,7 +611,7 @@
errors[key] = err.errors.get(e)[0].msg
return errors
- @checkRole('cm_ka')
+ @checkRole('cm')
def newAction(self):
# TODO: Use htmlfill here!
session_case = SessionCase()
@@ -684,7 +684,7 @@
def importCase(self):
return render('/casemanagement/upload.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def importXMLAction(self):
try:
xmlfile = request.POST['xmlfile']
Modified: base/trunk/mpulsweb/controllers/caseappointment.py
===================================================================
--- base/trunk/mpulsweb/controllers/caseappointment.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/caseappointment.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -25,14 +25,14 @@
def index(self, id):
return self.overview(id)
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def overview(self, id):
id = self._checkInt(id)
c.remindlist = CaseReminderOverview(id)
c.appointmentlist = CaseAppointmentOverview(id)
return render('/casemanagement/appointments.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def new(self, id):
id = self._checkInt(id)
c.form_errors = {}
@@ -45,7 +45,7 @@
form = render('/casemanagement/newAppointment.mako')
return formencode.htmlfill.render(form, defaults=form_defaults)
- @checkRole('cm_ka')
+ @checkRole('cm')
def newReminder(self, id):
id = self._checkInt(id)
case = self._loadCase(id)
@@ -62,7 +62,7 @@
form = render('/casemanagement/newAppointment.mako')
return formencode.htmlfill.render(form, defaults=form_defaults)
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def newAction(self):
validator = CreateAppointmentForm()
factory = CaseAppointmentFactory()
@@ -95,7 +95,7 @@
raise
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
@checkPrivacyStatement('showAppointment')
def show(self, id, confirmed=True):
# This method has a "confirmed" parameter because of
@@ -112,7 +112,7 @@
c.appointment = app
return render('/casemanagement/showAppointment.mako')
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def edit(self, id):
id = self._checkInt(id)
factory = CaseAppointmentFactory()
@@ -135,7 +135,7 @@
auto_insert_errors=False,
errors=c.form_errors)
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def editAction(self):
validator = CreateAppointmentForm()
factory = CaseAppointmentFactory()
Modified: base/trunk/mpulsweb/controllers/casedocument.py
===================================================================
--- base/trunk/mpulsweb/controllers/casedocument.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/casedocument.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -21,22 +21,22 @@
class CasedocumentController(BaseController):
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def index(self, id):
return self.overview(id)
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def overview(self, id):
id = self._checkInt(id)
case = self._loadCase(id)
c.files = case.getDocuments()
return render('/documents/case_overview.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def new(self):
return render('/documents/case_new.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def newAction(self):
validator = UploadCaseDocumentForm()
try:
@@ -68,7 +68,7 @@
auto_insert_errors=False,
errors=c.form_errors)
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def show(self, id):
id = self._checkInt(id)
try:
@@ -83,7 +83,7 @@
log.exception(e)
redirect_to(controller="case", action="documents")
- @checkRole('cm_ka')
+ @checkRole('cm')
def delete(self, id, confirmed):
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
Modified: base/trunk/mpulsweb/controllers/document.py
===================================================================
--- base/trunk/mpulsweb/controllers/document.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/document.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -44,11 +44,11 @@
class DocumentController(BaseController):
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def index(self):
redirect_to(action='globalOverview')
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def globalOverview(self):
try:
c.files = listDocuments()
@@ -57,11 +57,11 @@
raise
return render('/documents/global_overview.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def globalUpload(self):
return render('/documents/global_upload.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def globalUploadAction(self):
validator = UploadGlobalDocumentForm()
try:
@@ -87,7 +87,7 @@
auto_insert_errors=False,
errors=c.form_errors)
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def globalShow(self, id):
id = self._checkInt(id)
try:
@@ -102,7 +102,7 @@
log.exception(e)
redirect_to(controller="case", action="documents", id=case)
- @checkRole('admin_ka')
+ @checkRole('admin')
def globalDelete(self, id, confirmed='0'):
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
Modified: base/trunk/mpulsweb/controllers/formularpage.py
===================================================================
--- base/trunk/mpulsweb/controllers/formularpage.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/formularpage.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -114,24 +114,24 @@
# or, return a response
return 'Hello World'
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def select(self, id):
c.formular = get_rendered_page(id)
return render('/formularpage/formular.mako')
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def edit(self, id):
session['render_mode'] = 'rw'
session.save()
return self.select(id)
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def show(self, id):
session['render_mode'] = 'ro'
session.save()
return self.select(id)
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def undo(self, id):
unc = session.get('uncommited_fields')
if unc:
@@ -144,7 +144,7 @@
session.save()
return self.select(session['navigation.selectedpage'])
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def save(self):
case_id = session['case'].id
factory = InstanceFactory(g.formedTree, PostgresDBInterface())
@@ -271,7 +271,7 @@
id=param.split('|')[1])
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def printout(self, id):
c.print_version = 1
render_mode = session['render_mode']
Modified: base/trunk/mpulsweb/controllers/logbook.py
===================================================================
--- base/trunk/mpulsweb/controllers/logbook.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/logbook.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -50,7 +50,7 @@
class LogbookController(BaseController):
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def index(self, id):
return self.overview(id)
@@ -69,7 +69,7 @@
return render('/logbook/overview.mako')
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def show(self, id):
id = self._checkInt(id)
try:
@@ -86,7 +86,7 @@
c.entry = entry
return render('/logbook/show.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def new(self, id):
id = self._checkInt(id)
@@ -111,7 +111,7 @@
auto_insert_errors=False,
errors=c.form_errors)
- @checkRole('cm_ka')
+ @checkRole('cm')
def newAction(self):
checker = LogbookEntryChecker(request.params)
validator = CreateLogbookForm()
@@ -154,7 +154,7 @@
return render('/logbook/dialogs/failed_create_logbook_entry.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def edit(self, id):
id = self._checkInt(id)
c.form_errors = {}
@@ -184,7 +184,7 @@
id=session['case'].id)
return render('/logbook/dialogs/failed_show_logbook_entry.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def editAction(self):
params = request.params
id = self._checkInt(params.getone('id'))
@@ -226,7 +226,7 @@
id=session['case'].id)
return render('/logbook/dialogs/failed_save_logbook_entry.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def delete(self, id, confirmed=False):
id = self._checkInt(id)
confirmed = self._checkBool(confirmed)
@@ -255,7 +255,7 @@
id=session['case'].id)
return render('/logbook/dialogs/confirm_delete_logbook_entry.mako')
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def printout(self, id):
id = self._checkInt(id)
c.print_version = 1
Modified: base/trunk/mpulsweb/controllers/navigation.py
===================================================================
--- base/trunk/mpulsweb/controllers/navigation.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/navigation.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -42,7 +42,7 @@
class NavigationController(BaseController):
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+ @checkRole(('admin', 'cm', 'pt_dlr'))
def index(self):
raise HTTPNotFound()
Modified: base/trunk/mpulsweb/controllers/phase.py
===================================================================
--- base/trunk/mpulsweb/controllers/phase.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/phase.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -12,11 +12,11 @@
class PhaseController(BaseController):
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def index(self, id):
return self.overview(id)
- @checkRole(('admin_ka', 'cm_ka'))
+ @checkRole(('admin', 'cm'))
def overview(self, id):
id = self._checkInt(id)
c.phases = PhaseFactory().load(id)
@@ -24,7 +24,7 @@
c.show_actions = g.mpuls_config.get('phases', 'changemode') != PC_FULLAUTO
return render('/phase/phase.mako')
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def setPhase(self, id, value):
case = self._loadCase(id)
# Set phase
@@ -41,7 +41,7 @@
c.url_ok = h.url_for(controller='/phase', action='overview', id=case.id)
return render('/phase/dialogs/success_set_phase.mako')
- @checkRole(('cm_ka'))
+ @checkRole(('cm'))
def editAction(self):
case = self._loadCase(request.params.get('case_id'))
newphase = None
Modified: base/trunk/mpulsweb/controllers/settings.py
===================================================================
--- base/trunk/mpulsweb/controllers/settings.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/settings.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -17,7 +17,7 @@
class SettingsController(BaseController):
- @checkRole('admin_ka')
+ @checkRole('admin')
def index(self):
return self.show()
@@ -27,7 +27,7 @@
c.agency = Agency()
return render('/settings/show.mako')
- @checkRole('admin_ka')
+ @checkRole('admin')
def edit(self):
c.agency = Agency()
c.form_errors = {}
@@ -38,7 +38,7 @@
auto_insert_errors=False,
errors=c.form_errors)
- @checkRole('admin_ka')
+ @checkRole('admin')
def editAction(self):
validator = EditSettingsForm()
c.agency = Agency()
Modified: base/trunk/mpulsweb/controllers/usersettings.py
===================================================================
--- base/trunk/mpulsweb/controllers/usersettings.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/controllers/usersettings.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -48,27 +48,27 @@
class UsersettingsController(BaseController):
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ @checkRole(('admin', 'cm', 'pt_dlr', 'pb'))
def index(self):
# Return a rendered template
# return render('/some/template.mako')
# or, Return a response
return 'Hello, User'
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ @checkRole(('admin', 'cm', 'pt_dlr', 'pb'))
def showSettings(self, id):
id = self._checkInt(id)
c.uo = UserObject(id)
c.vuo = UserGroup(c.uo.standin)
return render('/usersettings/show_settings.mako')
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ @checkRole(('admin', 'cm', 'pt_dlr', 'pb'))
def changePassword(self):
c.form_errors = {}
c.form_result = {}
return render('/usersettings/change_password.mako')
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ @checkRole(('admin', 'cm', 'pt_dlr', 'pb'))
def changePasswordAction(self):
# Disable changing passwords if administration module is disabled
@@ -100,13 +100,13 @@
return render('/usersettings/change_password.mako')
return render('/usersettings/dialogs/notificate_setpassword.mako')
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ @checkRole(('admin', 'cm', 'pt_dlr', 'pb'))
def changePasswordOnLogin(self):
c.form_errors = {}
c.form_result = {}
return render('/usersettings/change_password_login.mako')
- @checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
+ @checkRole(('admin', 'cm', 'pt_dlr', 'pb'))
def changePasswordOnLoginAction(self):
# Do not forget to unset the flag for the need for pass change if this
# action succseeds
@@ -136,7 +136,7 @@
return render('/usersettings/change_password_login.mako')
return render('/usersettings/dialogs/notificate_setpassword.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def editStandin(self, id):
id = self._checkInt(id)
c.form_errors = {}
@@ -152,7 +152,7 @@
c.grouplist = ug.getGroupList(filter)
return render('usersettings/edit_standin.mako')
- @checkRole('cm_ka')
+ @checkRole('cm')
def editStandinAction(self):
validator = BaseFormValidator()
try:
Modified: base/trunk/mpulsweb/lib/search.py
===================================================================
--- base/trunk/mpulsweb/lib/search.py 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/lib/search.py 2011-11-01 12:33:12 UTC (rev 5512)
@@ -302,7 +302,7 @@
Derived classes may override this method if necessary.
"""
- if hasRole(['admin_ka', 'pb_ka']):
+ if hasRole(['admin', 'pb']):
return "TRUE"
which_user = 0
Modified: base/trunk/mpulsweb/templates/administration/show_user_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_user_body.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/administration/show_user_body.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -38,7 +38,7 @@
<td class="label">${_('Role')}</td>
<td class="table_row_v_2">${c.uo.getRole()}</td>
</tr>
- % if h.hasRole(['admin_ka']):
+ % if h.hasRole(['admin']):
<tr>
<td class="label table_header_v table_width_mid_l">${_('Activated')}</td>
<td class="table_row_v">
Modified: base/trunk/mpulsweb/templates/appointments/appointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/appointmentlist.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/appointments/appointmentlist.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -1,7 +1,7 @@
<%inherit file="/appointments/overview_body.mako" />
<%def name="showAppointmentActions(appointment)">
<a href="${h.url_for(controller='/appointment', action='show', id=appointment.id)}"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}" title="${_('Show')}"></a>
-% if h.hasRole(['admin_ka']):
+% if h.hasRole(['admin']):
<a href="${h.url_for(controller='/appointment', action='delete', id=appointment.id, confirmed=0)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('Delete')}" title="${_('Delete')}"></a>
% endif
</%def>
Modified: base/trunk/mpulsweb/templates/appointments/edit_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/edit_body.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/appointments/edit_body.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -41,7 +41,7 @@
</fieldset>
<fieldset>
<legend>${_('Event data')}</legend>
- % if h.hasRole(['cm_ka']):
+ % if h.hasRole(['cm']):
<div class="w100">
% if c.form_errors.get('type'):
<label for="type" class="error_font">${_('Type of event')}</label><br>
Modified: base/trunk/mpulsweb/templates/appointments/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/overview.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/appointments/overview.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -7,7 +7,7 @@
<div id="content_ueberschrift">
${_('Event overview')}
</div>
- % if h.hasRole(['admin_ka']):
+ % if h.hasRole(['admin']):
<div id="modusfield">
<div class="actions">
<ul>
Modified: base/trunk/mpulsweb/templates/appointments/remindlist_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/remindlist_body.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/appointments/remindlist_body.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -12,7 +12,7 @@
<td class="title">${appointment.title | F.NA}</td>
<td class="action">
${self.showAppointmentActions(appointment)}
- % if h.hasRole(['cm_ka']):
+ % if h.hasRole(['cm']):
${self.showKeepActiveActions(appointment)}
% endif
</td>
Modified: base/trunk/mpulsweb/templates/appointments/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/show.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/appointments/show.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -11,7 +11,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- % if h.hasRole(['admin_ka']):
+ % if h.hasRole(['admin']):
<li>
<a href="${h.url_for(controller='/appointment', action='edit', id=c.appointment.id)}">${_('Edit appointment')}</a>
</li>
Modified: base/trunk/mpulsweb/templates/casebundle/editor.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/editor.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casebundle/editor.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -18,7 +18,7 @@
<li>${case.last_name | F.NA}, ${case.first_name | F.NA}</li>
% endfor
</ul>
-% if h.hasRole(['admin_ka']):
+% if h.hasRole(['admin']):
<form action="${h.url_for(controller="case_bundle", action="set_editor")}" method="POST">
<select name="editor">
% for user in c.user_list:
Modified: base/trunk/mpulsweb/templates/casebundle/standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/standin.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casebundle/standin.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -26,7 +26,7 @@
% endfor
</ul>
<p><strong>${_('attention')}!</strong> ${_('The existing rules were overwritten')}.</p>
-% if (h.hasRole(['admin_ka'])) or True:
+% if (h.hasRole(['admin'])) or True:
<form action="${h.url_for(controller="case_bundle", action="set_standin")}" method="POST">
<table>
<tr>
Modified: base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -6,7 +6,7 @@
<img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
alt="${_('Show')}" title="${_('Show')}">
</a>
- % if h.hasRole(['cm_ka']) and session.get('case').getState().getState() == 1:
+ % if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
<a href="${h.url_for(controller='/caseappointment', action='delete',
id=appointment.id, confirmed=0)}">
<img src="${h.url_for('/images/icons/delete_active_22.png')}"
Modified: base/trunk/mpulsweb/templates/casemanagement/appointments.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -9,7 +9,7 @@
<div id="content_ueberschrift">
${_('Event overview')}
</div>
-% if h.hasRole(['cm_ka']) and session.get('case').getState().getState() == 1:
+% if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
<div id="modusfield">
<div class="actions">
<ul>
Modified: base/trunk/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -158,7 +158,7 @@
</%def>
<%def name="get_state_icon(case)">
- % if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'organisation'):
+ % if h.hasRole(['cm']) and g.mpuls_config.is_enabled('case-module', 'organisation'):
% if str(case.getEditor().id) == str(session.get('USER_AUTHORIZED').id):
<img src = "${h.url_for('/images/icons/edit_editor.png')}"
border = "0"
@@ -217,7 +217,7 @@
width = "22"
height = "22"></a>
% endif
- % if h.hasRole(['admin_ka']):
+ % if h.hasRole(['admin']):
% if case.getState().getState() in (3, 5):
<a href="${h.url_for(controller='case', action='delete', id=case.id,
confirmed=0)}">
@@ -250,7 +250,7 @@
width = "22"
height = "22"></a>
% endif
- % elif h.hasRole(['cm_ka']) and case.getState().getState() in (1, 2):
+ % elif h.hasRole(['cm']) and case.getState().getState() in (1, 2):
% if g.mpuls_config.is_enabled('case-module', 'anonymize'):
<a href="${h.url_for(controller='case',
action='markForAnonymizeFromOverview', id=case.id,
Modified: base/trunk/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/main.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casemanagement/main.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -81,7 +81,7 @@
<div class="menu">
<h1>${_('case document')}</h1>
<div class="actions">
- % if h.hasRole(['cm_ka', 'admin_ka']):
+ % if h.hasRole(['cm', 'admin']):
${self.buildInfofield()}
<ul>
<li>
@@ -100,7 +100,7 @@
id=session.get('case').id)}"
onclick="return checkModification();">${_('Phase in CM')}</a>
</li>
- % if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
+ % if h.hasRole(['cm']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
<li>
<a href="${h.url_for(controller='logbook',
action='index',
@@ -126,7 +126,7 @@
<ul class="mainMenu" id="mainMenuCase"> <!--ID only because of IE6 -->
<li>${_('More options')}
<ul>
- % if h.hasRole(['cm_ka', 'admin_ka']):
+ % if h.hasRole(['cm', 'admin']):
% if g.mpuls_config.is_enabled('case-module', 'organisation'):
<li>
<a href="${h.url_for(controller='case',
Modified: base/trunk/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -27,7 +27,7 @@
</td>
</tr>
</table>
-% if h.hasRole(['admin_ka']) and session.get('case').getState().getState() == 1:
+% if h.hasRole(['admin']) and session.get('case').getState().getState() == 1:
<form action="${h.url_for(controller="case", action="setEditorAction")}" method="POST">
<input type="hidden" name="case_id" value="${session.get('case').id}">
<select name="editor">
@@ -40,7 +40,7 @@
% endif
<h2>${_('Standin')}</h2>
-% if ((h.hasRole(['admin_ka']) or (c.current_user.id == c.editor.id))) and session.get('case').getState().getState() == 1:
+% if ((h.hasRole(['admin']) or (c.current_user.id == c.editor.id))) and session.get('case').getState().getState() == 1:
<form action="${h.url_for(controller="case", action="setStandinAction")}" method="POST">
<input type="hidden" name="case_id" value="${session.get('case').id}">
<table>
Modified: base/trunk/mpulsweb/templates/casemanagement/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/overview.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casemanagement/overview.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -7,11 +7,11 @@
<li><a href="${h.url_for(controller='/case_overview')}">${_('Case document overview')}</a></li>
</%def>
<h1>${_('Case documents overview')}</h1>
-% if h.hasRole(['admin_ka']):
+% if h.hasRole(['admin']):
<!-- <p>${_('List all case documents of the organisation or the user')}</p>-->
% endif
-% if h.hasRole(['cm_ka']):
+% if h.hasRole(['cm']):
<!-- <p>${_('List all cases of this user')}</p>-->
%endif
<%include file="/casemanagement/search.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -5,7 +5,7 @@
<img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
alt="${_('Show')}"
title="${_('Show')}"></a>
-% if h.hasRole(['cm_ka']) and session.get('case').getState().getState() == 1:
+% if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
<a href="${h.url_for(controller='/caseappointment', action='delete',
id=appointment.id, confirmed=0)}">
<img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
Modified: base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -12,7 +12,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- % if h.hasRole(['cm_ka']) and session.get('case').getState().getState() == 1:
+ % if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
<li>
<a href="${h.url_for(controller='/caseappointment', action='edit', id=c.appointment.id)}">
${_('Edit appointment')}
Modified: base/trunk/mpulsweb/templates/documents/case_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_overview.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/documents/case_overview.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -18,7 +18,7 @@
<div id="content_ueberschrift">
${_('Document overview')}
</div>
- % if h.hasRole(['cm_ka']) and session.get('case').getState().getState() == 1:
+ % if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
<div id="modusfield">
<div class="actions">
<ul>
@@ -63,7 +63,7 @@
><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}"
title="${_('Show')}" title="${_('Show')}">
</a>
- % if h.hasRole(['cm_ka']) and session.get('case').getState().getState() == 1:
+ % if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
<a href="${h.url_for(controller='/casedocument', action='delete', id=f.id, confirmed=0)}">
<img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
alt="${_('Delete')}"
Modified: base/trunk/mpulsweb/templates/documents/global_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_overview.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/documents/global_overview.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -9,7 +9,7 @@
<div id="content_ueberschrift">
${_('Document overview')}
</div>
-% if h.hasRole(['admin_ka']):
+% if h.hasRole(['admin']):
<div id="modusfield">
<div class="actions">
<ul>
@@ -53,7 +53,7 @@
><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}"
title="${_('Show')}" title="${_('Show')}">
</a>
- % if h.hasRole(['admin_ka']):
+ % if h.hasRole(['admin']):
<a href="${h.url_for(controller='/document', action='globalDelete', id=f.id)}"
><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
alt="${_('Delete')}" title="${_('Delete')}">
Modified: base/trunk/mpulsweb/templates/evaluation/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/evaluation/overview.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/evaluation/overview.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -6,11 +6,11 @@
<li><a href="${h.url_for(controller='/case_overview')}">${_('Agency overview')}</a></li>
</%def>
<h1>${_('Agency overview')}</h1>
-% if h.hasRole(['admin_ka']):
+% if h.hasRole(['admin']):
<!-- <p>${_('List all case documents of the organisation or the user')}</p>-->
% endif
-% if h.hasRole(['cm_ka']):
+% if h.hasRole(['cm']):
<!-- <p>${_('List all cases of this user')}</p>-->
%endif
<%include file="/evaluation/search.mako" />
Modified: base/trunk/mpulsweb/templates/formularpage/formular.mako
===================================================================
--- base/trunk/mpulsweb/templates/formularpage/formular.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/formularpage/formular.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -33,7 +33,7 @@
</div>
<div class="actions">
<ul>
- % if h.hasRole(['cm_ka']) and session.get('case').getState().state not in (3,4,5):
+ % if h.hasRole(['cm']) and session.get('case').getState().state not in (3,4,5):
% if session.get('render_mode') == 'ro':
<li><a href="${h.url_for(controller='/formularpage', action='edit',
id=c.page_id)}"
Modified: base/trunk/mpulsweb/templates/formularpage/formular_print.mako
===================================================================
--- base/trunk/mpulsweb/templates/formularpage/formular_print.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/formularpage/formular_print.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -40,7 +40,7 @@
</div>
<div class="actions">
<ul>
- % if h.hasRole(['cm_ka']) and session.get('case').getState().state not in (3,4,5):
+ % if h.hasRole(['cm']) and session.get('case').getState().state not in (3,4,5):
% if session.get('render_mode') == 'ro':
<li><a href="${h.url_for(controller='/formularpage', action='edit',
id=c.page_id)}"
Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -11,7 +11,7 @@
<div id="content_ueberschrift">
Tagebuch
</div>
-% if h.hasRole(['cm_ka']):
+% if h.hasRole(['cm']):
<div id="modusfield">
<div class="actions">
<ul>
@@ -114,7 +114,7 @@
title="Eintrag ansehen"
width="22"
height="22"></a>
- % if h.hasRole(['cm_ka']) and entry.getKindAsInt() != 0 and session.get('case').getState().getState() == 1:
+ % if h.hasRole(['cm']) and entry.getKindAsInt() != 0 and session.get('case').getState().getState() == 1:
<a href="${h.url_for(controller='/logbook', action='delete', id=entry.id, confirmed=0)}">
<img src="${h.url_for('/images/icons/delete_active_22.png')}"
alt="${_('delete')}"
Modified: base/trunk/mpulsweb/templates/logbook/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/show.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/logbook/show.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -13,7 +13,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- % if h.hasRole(['cm_ka']) and c.entry.getKindAsInt() != 0 and session.get('case').getState().getState() == 1:
+ % if h.hasRole(['cm']) and c.entry.getKindAsInt() != 0 and session.get('case').getState().getState() == 1:
<li>
<a href="${h.url_for(controller='/logbook', action='edit', id=c.entry.id)}">
${_('Edit entry')}
Modified: base/trunk/mpulsweb/templates/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/main.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/main.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -73,7 +73,7 @@
<%def name="buildNavigation()">
% if (h.getLogin() != 'adm'):
- % if h.hasRole(['cm_ka', 'admin_ka']):
+ % if h.hasRole(['cm', 'admin']):
<div class="menu">
<div class="actions">
<h1>${_('%s Start') % h.get_app_title()}</h1>
@@ -116,7 +116,7 @@
${_('Case documents ')}
</a>
</li>
- % if h.hasRole(['cm_ka']):
+ % if h.hasRole(['cm']):
% if g.mpuls_config.is_enabled('case-module', 'create'):
<li>
<a href="${h.url_for(controller='/case', action='new')}">
@@ -164,7 +164,7 @@
</div>
</div>
% endif
- % if h.hasRole(['admin_ka']) and g.mpuls_config.is_enabled('module', 'administration'):
+ % if h.hasRole(['admin']) and g.mpuls_config.is_enabled('module', 'administration'):
<div class="menu">
<div class="actions">
<h1>${_('Administration')}</h1>
@@ -279,7 +279,7 @@
<div id="main">
<div class="left">
<div>
- % if h.hasRole(['cm_ka']):
+ % if h.hasRole(['cm']):
${self.buildPrivacyfield()}
% endif
${next.buildNavigation()}
Modified: base/trunk/mpulsweb/templates/phase/phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/phase.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/phase/phase.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -16,7 +16,7 @@
<form method="POST" action="${h.url_for(controller='/phase', action='editAction')}">
<input type="hidden" name="case_id" value="${session.get('case').id}">
<table id="cmphases">
- <% is_allowed = h.hasRole(('cm_ka',)) %>
+ <% is_allowed = h.hasRole(('cm',)) %>
<tr>
<th>${_('Phase')}</th>
<th width="25px"> </th>
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -2,7 +2,7 @@
<div class="dialog" />
<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the statement')}</h1>
<p>${_('The acceptance statement of the youth for work and usage of his data. You are resonsible for this.')}</p>
-% if h.hasRole(['cm_ka']):
+% if h.hasRole(['cm']):
<p>${h.literal(_('Please notice that the acceptence statement needs to be written. For this use <a href="%s" target="_blank">Printversion of this statement</a>. Please choose:') % h.url_for(controller="/privacy", action="printStatement", id=c.ds_id))}
<ol>
Modified: base/trunk/mpulsweb/templates/search/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/search/search.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/search/search.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -17,7 +17,7 @@
</tr>
% endif
- % if h.hasRole(['admin_ka']) and g.mpuls_config.is_enabled('search', 'option-editor'):
+ % if h.hasRole(['admin']) and g.mpuls_config.is_enabled('search', 'option-editor'):
<tr>
<td class="label">${_('Responsibility')}</td>
<td>
@@ -30,7 +30,7 @@
</td>
</tr>
% endif
- % if h.hasRole(['admin_ka']) and g.mpuls_config.is_enabled('search', 'option-agency'):
+ % if h.hasRole(['admin']) and g.mpuls_config.is_enabled('search', 'option-agency'):
<tr style="${not c.extended_search and 'display:none' or ''}">
<td class="label"><label for="branch">${_("Branch")}</label></td>
<td>
@@ -38,7 +38,7 @@
</td>
</tr>
% endif
- % if h.hasRole(['cm_ka']):
+ % if h.hasRole(['cm']):
% if g.mpuls_config.is_enabled('case-module', 'organisation') and g.mpuls_config.is_enabled('search', 'option-responsibilty'):
<tr>
<td class="label">${_('Responsibility')}</td>
Modified: base/trunk/mpulsweb/templates/usersettings/show_settings.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/show_settings.mako 2011-10-28 12:51:31 UTC (rev 5511)
+++ base/trunk/mpulsweb/templates/usersettings/show_settings.mako 2011-11-01 12:33:12 UTC (rev 5512)
@@ -13,7 +13,7 @@
% if g.mpuls_config.is_enabled('module', 'administration'):
<li><a href="${h.url_for(controller='/usersettings', action='changePassword', id=h.getUserId())}"> ${_('Change user password')}</a></li>
% endif
- % if h.hasRole(['cm_ka']):
+ % if h.hasRole(['cm']):
% if g.mpuls_config.is_enabled('case-module', 'organisation'):
<li><a href="${h.url_for(controller='/usersettings', action='editStandin', id=h.getUserId())}"> ${_('Replace standin')}</a></li>
% endif
More information about the Mpuls-commits
mailing list