[Mpuls-commits] r32 - in trunk: . waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/model waskaweb/templates/administration waskaweb/templates/administration/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 13 15:08:43 CEST 2008
Author: thomas
Date: 2008-08-13 15:08:43 +0200 (Wed, 13 Aug 2008)
New Revision: 32
Added:
trunk/waskaweb/templates/administration/dialogs/failed_delete_user.mako
trunk/waskaweb/templates/administration/dialogs/failed_new_user.mako
trunk/waskaweb/templates/administration/dialogs/success_edit_agency.mako
trunk/waskaweb/templates/administration/dialogs/success_edit_user.mako
trunk/waskaweb/templates/administration/success_edit_user.mako
Modified:
trunk/ChangeLog.txt
trunk/waskaweb/controllers/administration.py
trunk/waskaweb/controllers/rg_aid.py
trunk/waskaweb/controllers/statement.py
trunk/waskaweb/controllers/usersettings.py
trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
trunk/waskaweb/i18n/waskaweb.pot
trunk/waskaweb/model/navigation.py
trunk/waskaweb/templates/administration/edit_user.mako
trunk/waskaweb/templates/administration/overview_user.mako
Log:
Load 39228105715f into trunk.
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/ChangeLog.txt 2008-08-13 13:08:43 UTC (rev 32)
@@ -1,5 +1,62 @@
+2008-02-04 Benjamin Kirschner <benni.kirschner at intevation.de>
+
+ * waskaweb/controllers/administration.py
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+ waskaweb/i18n/waskaweb.pot:
+ Small fix on new exception dialog.
+ Fix on typos.
+
+ * waskaweb/templates/administration/edit_user.mako:
+ Added table format
+
+ * waskaweb/controllers/administration.py
+ A waskaweb/templates/administration/dialogs/success_edit_user.mako:
+ Added dialog to "Benutzer bearbeiten". After pressing the save
+ button a dialog with the information, that the settings have been
+ saved, pops up.
+
+ * waskaweb/controllers/administration.py
+ A waskaweb/templates/administration/dialogs/success_edit_agency.mako:
+ Added dialog to "Agentureinstellungen bearbeiten". After pressing
+ the save button a dialog with the information, that the settings
+ have been saved, pops up.
+
+ * waskaweb/controllers/usersettings.py
+ A waskaweb/templates/administration/success_edit_user.mako
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+ waskaweb/i18n/waskaweb.pot:
+ Added dialog to "Vertretung (Standard-Vertretung) setzen". After
+ pressing the save button a success dialog pops up.
+
+2008-02-03 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/controllers/administration.py,
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot,
+ waskaweb/templates/administration/dialogs/failed_new_user.mako:
+ Fixed issue190. Database exception when creating a user with a login
+ name which already exists in the database is now caught and a error
+ dialog is displayed.
+
+2008-02-03 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/templates/administration/overview_user.mako: The currently
+ logged in user will not see the delete icon for his user in the user
+ overview. This prevents the admin for deleting himself.
+
+ * waskaweb/controllers/administration.py: Added check in the
+ controller to make sure that the user can not delete himself.
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot,
+ waskaweb/templates/administration/dialogs/failed_delete_user.mako:
+ Added new error dialof which pops up if the user tries to delete
+ himself (by crafting and delete-url by hand e.g)
+
2008-02-01 Torsten Irlaender <torsten.irlaender at intevation.de>
+ Tagged BETA 19
+
* waskaweb/model/case.py, waskaweb/model/repeatgroup.py: Added "uuid"
paramater to create_ds functions. Modified SQL-statement.
Modified: trunk/waskaweb/controllers/administration.py
===================================================================
--- trunk/waskaweb/controllers/administration.py 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/controllers/administration.py 2008-08-13 13:08:43 UTC (rev 32)
@@ -23,11 +23,15 @@
RESET_PASSWORD_CONFIRM = _('adm_reset_user_password')
RESET_PASSWORD_CONFIRM_QUESTION = _('adm_reset_user_password_question')
-DELETE_USER_NOTIFICATION_SUCCESS = _('adm_delete_user_success_header')
+DELETE_USER_NOTIFICATION_SUCCESS = _('adm_delete_user_success_header')
DELETE_USER_NOTIFICATION_TEXT_SUCCESS = _('adm_delete_user_success_text')
+DELETE_SELFUSER_FAILURE = _('adm_delete_selfuser_notification_header')
+DELETE_SELFUSER_FAILURE_TEXT = _('adm_delete_selfuser_notification_text')
DELETE_USER_NOTIFICATION = _('adm_delete_user_notification_header')
DELETE_USER_NOTIFICATION_TEXT = _('adm_delete_user_notification_text')
+NEW_USER_FAILURE_HEADER = _('adm_delete_user_failure_header')
+NEW_USER_FAILURE_TEXT = _('adm_delete_user_failure_text')
DELETE_USER_SUCCESS_HEADER = _('adm_delete_user_success_header')
DELETE_USER_SUCCESS_TEXT = _('adm_delete_user_success_text')
@@ -39,6 +43,12 @@
SETEDITOR_NOTIFICATION_SUCCESS_REST = _('adm_set_editor_success_text_rest')
SETEDITOR_NOTIFICATION_SUCCESS_HEAD = _('adm_set_editor_success_text_head')
SETEDITOR_NOTIFICATION_SUCCESS_REST_HEAD= _('adm_set_editor_success_text_rest_head')
+
+EDIT_USER_SUCCESS_HEADER = _('adm_edit_user_header')
+EDIT_USER_SUCCESS_TEXT = _('adm_edit_user_text')
+
+EDIT_AGENCY_SUCCESS_HEADER = _('adm_edit_agency_header')
+EDIT_AGENCY_SUCCESS_TEXT = _('adm_edit_agency_text')
class AdministrationController(BaseController):
def index(self):
@@ -110,7 +120,11 @@
form_result = validator.to_python(request.params)
c.uo.setData(form_result)
c.uo.store()
- return self.overviewUser()
+ c.success_for = EDIT_USER_SUCCESS_HEADER
+ c.success_text = EDIT_USER_SUCCESS_TEXT
+ c.url_ok = "/administration/overviewUser"
+ return render('/administration/dialogs/success_edit_user.mako')
+ #return self.overviewUser()
except formencode.Invalid, error:
c.form_result = error.value
c.form_errors = error.error_dict or {}
@@ -140,6 +154,12 @@
c.form_errors = error.error_dict or {}
form = render('/administration/new_user.mako')
return htmlfill.render(unicode(form, 'utf-8'), c.form_result, c.form_errors, auto_insert_errors=False)
+ except:
+ c.failed_for = NEW_USER_FAILURE_HEADER
+ c.failed_text = NEW_USER_FAILURE_TEXT
+ c.url_ok = "/administration/overviewUser"
+ return render('/administration/dialogs/failed_new_user.mako')
+
except:
return render('/tests/trace.mako')
#return "Es ist ein Fehler beim Speichern des Benutzers aufgetreten."
@@ -150,8 +170,14 @@
confirmed = self._checkBool(confirmed)
try:
uo = UserObject(id)
+ # Make sure that the user can not delete himself
+ if uo.id == session.get('USER_AUTHORIZED').id:
+ c.failed_for = DELETE_SELFUSER_FAILURE
+ c.failed_text = DELETE_SELFUSER_FAILURE_TEXT
+ c.url_ok = "/administration/overviewUser"
+ return render('/administration/dialogs/failed_delete_user.mako')
+
if confirmed:
-
# Check if there are cases for which the user is the editor. If
# he is an editor then raise a dialog which allows the user to
# transfer the cases.
@@ -167,8 +193,6 @@
return render('/administration/delete_user_helper.mako')
else:
uo.delete()
- # Showup not implemented dialog as there is still an
- # persmission problem on the database
c.notification_for = DELETE_USER_NOTIFICATION_SUCCESS
c.notification_text = DELETE_USER_NOTIFICATION_TEXT_SUCCESS
c.success_for = DELETE_USER_SUCCESS_HEADER
@@ -245,9 +269,13 @@
c.form_errors = error.error_dict or {}
return render('/administration/edit_settings.mako')
- c.agency = Agency()
+ c.agency = Agency()
c.agency.store(c.form_result)
- return self.showSettings()
+ c.success_for = EDIT_AGENCY_SUCCESS_HEADER
+ c.success_text = EDIT_AGENCY_SUCCESS_TEXT
+ c.url_ok = "/administration/showSettings"
+ return render ('/administration/dialogs/success_edit_agency.mako')
+ #return self.showSettings()
@checkRole('admin_ka')
def viewPrivacyStatement(self):
Modified: trunk/waskaweb/controllers/rg_aid.py
===================================================================
--- trunk/waskaweb/controllers/rg_aid.py 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/controllers/rg_aid.py 2008-08-13 13:08:43 UTC (rev 32)
@@ -102,7 +102,7 @@
if aid.delete():
# Redirect to the overview page: 14 should be the correct page key
c.success_for = u'Angebot gelöscht!'
- c.success_text = u'Klicken Sie auf OK um fortzufahren.'
+ c.success_text = u'Klicken Sie auf OK, um fortzufahren.'
c.url_ok = "/case/edit/%s/14" % session.get('case').id
return render('/casemanagement/dialogs/success_delete_aid.mako')
#redirect_to('/case/edit/%s/14' % session.get('case').id)
Modified: trunk/waskaweb/controllers/statement.py
===================================================================
--- trunk/waskaweb/controllers/statement.py 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/controllers/statement.py 2008-08-13 13:08:43 UTC (rev 32)
@@ -102,8 +102,8 @@
controller="statement",
action="acceptPrivacyStatement", id=id, confirmed="1")
c.url_no = h.url_for('digest', id=id)
- return "<title>hello</title>"
- #return render('statement/dialogs/confirm.mako')
+ #return "<title>hello</title>"
+ return render('statement/dialogs/confirm.mako')
@checkRole('cm_ka')
def declinePrivacyStatement(self, id, confirmed):
Modified: trunk/waskaweb/controllers/usersettings.py
===================================================================
--- trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:08:43 UTC (rev 32)
@@ -16,9 +16,12 @@
log = logging.getLogger(__name__)
-SET_PASSWORD_NOTIFICATION_HEADER = u"""Benutzerpasswort geändert!"""
-SET_PASSWORD_NOTIFICATION_TEXT = u"""Ihr Passwort wurde erfolgreich geändert. Bitte klicken Sie auf "OK" um fortzufahren."""
+SET_PASSWORD_NOTIFICATION_HEADER = u"""Benutzerpasswort geändert!"""
+SET_PASSWORD_NOTIFICATION_TEXT = u"""Ihr Passwort wurde erfolgreich geändert. Bitte klicken Sie auf "OK", um fortzufahren."""
+EDIT_STANDIN_SUCCESS_HEADER = _('adm_edit_standin_success_header')
+EDIT_STANDIN_SUCCESS_TEXT = _('adm_edit_standin_success_text')
+
class UsersettingsController(BaseController):
@checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
@@ -92,8 +95,8 @@
session_user.needs_passrefresh = False
session['USER_AUTHORIZED'] = session_user
session.save()
- c.notification_for = SET_PASSWORD_NOTIFICATION_HEADER
- c.notification_text = SET_PASSWORD_NOTIFICATION_TEXT
+ c.success_for = SET_PASSWORD_NOTIFICATION_HEADER
+ c.success_text = SET_PASSWORD_NOTIFICATION_TEXT
c.url_ok = h.url_for(controller="usersettings", action="showSettings", id=session_user.id)
else:
return "Password could not be changed"
@@ -132,6 +135,11 @@
c.form_result = error.value
c.form_errors = error.error_dict or {}
return render('usersettings/edit_standin.mako')
- return self.showSettings(c.form_result.get('uid'))
+ c.success_for = EDIT_STANDIN_SUCCESS_HEADER
+ c.success_text = EDIT_STANDIN_SUCCESS_TEXT
+ uid = c.form_result.get('uid')
+ c.url_ok = "/usersettings/showSettings/%s" % (uid)
+ return render ('/usersettings/dialogs/success_edit_standin.mako')
+ # return self.showSettings(c.form_result.get('uid'))
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:08:43 UTC (rev 32)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-02-01 15:49+0100\n"
+"POT-Creation-Date: 2008-02-04 16:29+0100\n"
"PO-Revision-Date: 2007-10-14 20:33+0200\n"
"Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
@@ -26,22 +26,32 @@
msgstr "Wollen Sie wirklich das Passwort für folgenden Benutzer zurücksetzen:"
#: waskaweb/controllers/administration.py:26
-#: waskaweb/controllers/administration.py:31
+#: waskaweb/controllers/administration.py:35
msgid "adm_delete_user_success_header"
msgstr "Benutzer gelöscht!"
#: waskaweb/controllers/administration.py:27
-#: waskaweb/controllers/administration.py:32
+#: waskaweb/controllers/administration.py:36
msgid "adm_delete_user_success_text"
msgstr ""
"Der Benutzer wurde erfolgreich gelöscht. Bitte klicken Sie auf OK um "
"fortzufahren."
#: waskaweb/controllers/administration.py:29
+msgid "adm_delete_selfuser_notification_header"
+msgstr "Benutzer nicht gelöscht!"
+
+#: waskaweb/controllers/administration.py:30
+msgid "adm_delete_selfuser_notification_text"
+msgstr ""
+"Es ist nicht möglich den aktuell angemeldeten Nutzer zu löschen. Bitte "
+"klicken Sie auf OK, um fortzufahren."
+
+#: waskaweb/controllers/administration.py:31
msgid "adm_delete_user_notification_header"
msgstr "Benutzer nicht gelöscht!"
-#: waskaweb/controllers/administration.py:30
+#: waskaweb/controllers/administration.py:32
msgid "adm_delete_user_notification_text"
msgstr ""
"Der Benutzer kann nicht gelöscht werden, da er noch als Hauptbearbeiter für "
@@ -49,39 +59,75 @@
"Fallakten einen neuen Bearbeiter zu. Bitte klicken Sie auf OK um "
"fortzufahren."
+#: waskaweb/controllers/administration.py:33
+msgid "adm_delete_user_failure_header"
+msgstr "Benutzer nicht angelegt!"
+
#: waskaweb/controllers/administration.py:34
+msgid "adm_delete_user_failure_text"
+msgstr ""
+"Beim Anlegen des Benutzers ist ein Fehler aufgetreten. Bitte klicken Sie auf "
+"OK, um fortzufahren."
+
+#: waskaweb/controllers/administration.py:38
msgid "adm_delete_user_confirm_header"
msgstr "Benutzer löschen?"
-#: waskaweb/controllers/administration.py:35
+#: waskaweb/controllers/administration.py:39
msgid "adm_delete_user_confirm_text"
msgstr ""
"Wollen Sie den Benutzer löschen und die Daten unwiederbringlich verlieren?"
-#: waskaweb/controllers/administration.py:37
+#: waskaweb/controllers/administration.py:41
msgid "adm_set_editor_header"
msgstr "Fallakten übertragen"
-#: waskaweb/controllers/administration.py:38
+#: waskaweb/controllers/administration.py:42
msgid "adm_set_editor_success_text"
msgstr ""
"Fallakten wurden an %s, %s übertragen. Bitte klicken Sie auf OK, um %s, %s "
"zu löschen."
-#: waskaweb/controllers/administration.py:39
+#: waskaweb/controllers/administration.py:43
msgid "adm_set_editor_success_text_rest"
msgstr ""
"Fallakten wurden an %s, %s übertragen. %s, %s verfügt weiterhin über "
"Fallakten. Bitte klicken Sie auf OK, um fortzufahren."
-#: waskaweb/controllers/administration.py:40
+#: waskaweb/controllers/administration.py:44
msgid "adm_set_editor_success_text_head"
msgstr "Fallakten übertragen!"
-#: waskaweb/controllers/administration.py:41
+#: waskaweb/controllers/administration.py:45
msgid "adm_set_editor_success_text_rest_head"
msgstr "Fallakten übertragen. Weitere Fallakten vorhanden!"
+#: waskaweb/controllers/administration.py:47
+msgid "adm_edit_user_header"
+msgstr "Benutzereinstellungen gespeichert!"
+
+#: waskaweb/controllers/administration.py:48
+msgid "adm_edit_user_text"
+msgstr "Bitte klicken Sie auf OK, um fortzufahren."
+
+#: waskaweb/controllers/administration.py:50
+msgid "adm_edit_agency_header"
+msgstr "Agentureinstellungen gespeichert!"
+
+#: waskaweb/controllers/administration.py:51
+msgid "adm_edit_agency_text"
+msgstr "Bitte klicken Sie auf OK, um fortzufahren."
+
+#: waskaweb/controllers/usersettings.py:22
+msgid "adm_edit_standin_success_header"
+msgstr "Vertretung gespeichert!"
+
+#: waskaweb/controllers/usersettings.py:23
+msgid "adm_edit_standin_success_text"
+msgstr ""
+"Ihre Standard-Vertretung wurde gespeichert. Bitte klicken Sie auf OK, um "
+"fortzufahren."
+
#: waskaweb/lib/renderer.py:208
msgid "cm_rg_aid_overview_table_institution"
msgstr "Institution"
@@ -283,7 +329,7 @@
#: waskaweb/templates/main.mako:173
msgid "footer_version"
-msgstr "25.01.2008 | Beta 18"
+msgstr "01.02.2008 | Beta 19"
#: waskaweb/templates/main_login.mako:38
#: waskaweb/templates/start/responsible.mako:71
@@ -321,11 +367,17 @@
#: waskaweb/templates/administration/settings.mako:4
#: waskaweb/templates/administration/show_settings.mako:6
#: waskaweb/templates/administration/show_user.mako:5
+#: waskaweb/templates/administration/success_edit_user.mako:5
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:5
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:5
+#: waskaweb/templates/administration/dialogs/failed_delete_user.mako:5
+#: waskaweb/templates/administration/dialogs/failed_new_user.mako:5
#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:5
#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:5
#: waskaweb/templates/administration/dialogs/success_delete_user.mako:5
+#: waskaweb/templates/administration/dialogs/success_edit_agency.mako:5
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:5
+#: waskaweb/templates/statement/dialogs/ee_accept_success.mako:5
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:5
msgid "adm_np_root"
msgstr "Administration"
@@ -337,11 +389,16 @@
#: waskaweb/templates/administration/overview_user.mako:7
#: waskaweb/templates/administration/reset_password.mako:7
#: waskaweb/templates/administration/show_user.mako:6
+#: waskaweb/templates/administration/success_edit_user.mako:6
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:6
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:6
+#: waskaweb/templates/administration/dialogs/failed_delete_user.mako:6
+#: waskaweb/templates/administration/dialogs/failed_new_user.mako:6
#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:6
#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:6
#: waskaweb/templates/administration/dialogs/success_delete_user.mako:6
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:6
+#: waskaweb/templates/statement/dialogs/ee_accept_success.mako:6
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:6
msgid "adm_np_overview"
msgstr "Benutzerübersicht"
@@ -378,10 +435,12 @@
#: waskaweb/templates/administration/edit_settings.mako:6
#: waskaweb/templates/administration/show_settings.mako:7
+#: waskaweb/templates/administration/dialogs/success_edit_agency.mako:6
msgid "adm_np_showsettings"
msgstr "Agentureinstellungen"
#: waskaweb/templates/administration/edit_settings.mako:7
+#: waskaweb/templates/administration/dialogs/success_edit_agency.mako:7
msgid "adm_np_editsettings"
msgstr "Einstellungen bearbeiten"
@@ -424,11 +483,15 @@
#: waskaweb/templates/administration/edit_user.mako:15
#: waskaweb/templates/administration/reset_password.mako:8
#: waskaweb/templates/administration/show_user.mako:7
+#: waskaweb/templates/administration/success_edit_user.mako:7
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:7
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:7
msgid "adm_np_showuser"
msgstr "Benutzer anzeigen"
#: waskaweb/templates/administration/edit_user.mako:16
+#: waskaweb/templates/administration/success_edit_user.mako:8
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:8
msgid "adm_np_edituser"
msgstr "Benutzer bearbeiten"
@@ -624,7 +687,7 @@
msgstr "Aktionen"
#: waskaweb/templates/administration/overview_user.mako:36
-#: waskaweb/templates/administration/overview_user.mako:46
+#: waskaweb/templates/administration/overview_user.mako:48
#: waskaweb/templates/casemanagement/caselist.mako:45
#: waskaweb/templates/casemanagement/caselist.mako:82
#: waskaweb/templates/documents/case_overview.mako:42
@@ -636,8 +699,8 @@
msgid "cm_overview_a_show"
msgstr "Anzeigen"
-#: waskaweb/templates/administration/overview_user.mako:37
-#: waskaweb/templates/administration/overview_user.mako:47
+#: waskaweb/templates/administration/overview_user.mako:38
+#: waskaweb/templates/administration/overview_user.mako:50
#: waskaweb/templates/casemanagement/caselist.mako:47
#: waskaweb/templates/casemanagement/caselist.mako:50
#: waskaweb/templates/casemanagement/caselist.mako:84
@@ -772,6 +835,11 @@
msgid "adm_form_label_new_login_new_pw"
msgstr "Bei Anmeldung neues Passwort verlangen"
+#: waskaweb/templates/administration/success_edit_user.mako:9
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:9
+msgid "adm_np_edituser_success"
+msgstr "Benutzer gespeichert!"
+
#: waskaweb/templates/administration/userform_body.mako:45
msgid "adm_form_user_passwd"
msgstr "Passwort"
@@ -788,6 +856,14 @@
msgid "adm_np_delteuser_success"
msgstr "Benutzer gelöscht!"
+#: waskaweb/templates/administration/dialogs/failed_delete_user.mako:7
+msgid "adm_np_failed_deleteuser"
+msgstr "Benutzer nicht gelöscht!"
+
+#: waskaweb/templates/administration/dialogs/failed_new_user.mako:7
+msgid "adm_np_failed_createuser"
+msgstr "Benutzer nicht angelegt!"
+
#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:9
msgid "adm_np_deleteuser_helper_set_editor"
msgstr "Fallakte übertragen"
@@ -797,6 +873,10 @@
msgid "adm_np_success_deleteuser"
msgstr "Benutzer gelöscht!"
+#: waskaweb/templates/administration/dialogs/success_edit_agency.mako:8
+msgid "adm_np_editsettings_success"
+msgstr "Einstellungen gespeichert!"
+
#: waskaweb/templates/appointments/appointment_form.mako:6
msgid "app_form_label_title"
msgstr "Titel"
@@ -998,7 +1078,6 @@
#: waskaweb/templates/documents/case_overview.mako:5
#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:6
msgid "cm_np_select"
msgstr "Ausgewählte Fallakte"
@@ -1024,7 +1103,6 @@
#: waskaweb/templates/casemanagement/dialogs/success_restore.mako:5
#: waskaweb/templates/casemanagement/static_form/statement.mako:5
#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:4
#: waskaweb/templates/statement/dialogs/confirm.mako:5
#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
msgid "cm_np_root"
@@ -1501,7 +1579,6 @@
#: waskaweb/templates/casemanagement/main.mako:11
#: waskaweb/templates/casemanagement/overview.mako:7
#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:5
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:5
#: waskaweb/templates/statement/dialogs/missing_statement.mako:6
msgid "cm_np_overview"
msgstr "Fallaktenübersicht"
@@ -1685,7 +1762,7 @@
msgstr "Angebot löschen?"
#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:5
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:7
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:4
msgid "cm_np_att_overview"
msgstr "Anlagenübersicht"
@@ -1861,7 +1938,7 @@
msgid "cm_np_doc_failed"
msgstr "Fehler beim Hinzufügen"
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:8
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:5
msgid "cm_np_attachment_success"
msgstr "Anlage hinzugefügt"
Modified: trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:08:43 UTC (rev 32)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-02-01 15:49+0100\n"
+"POT-Creation-Date: 2008-02-04 16:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -26,51 +26,91 @@
msgstr ""
#: waskaweb/controllers/administration.py:26
-#: waskaweb/controllers/administration.py:31
+#: waskaweb/controllers/administration.py:35
msgid "adm_delete_user_success_header"
msgstr ""
#: waskaweb/controllers/administration.py:27
-#: waskaweb/controllers/administration.py:32
+#: waskaweb/controllers/administration.py:36
msgid "adm_delete_user_success_text"
msgstr ""
#: waskaweb/controllers/administration.py:29
+msgid "adm_delete_selfuser_notification_header"
+msgstr ""
+
+#: waskaweb/controllers/administration.py:30
+msgid "adm_delete_selfuser_notification_text"
+msgstr ""
+
+#: waskaweb/controllers/administration.py:31
msgid "adm_delete_user_notification_header"
msgstr ""
-#: waskaweb/controllers/administration.py:30
+#: waskaweb/controllers/administration.py:32
msgid "adm_delete_user_notification_text"
msgstr ""
+#: waskaweb/controllers/administration.py:33
+msgid "adm_delete_user_failure_header"
+msgstr ""
+
#: waskaweb/controllers/administration.py:34
+msgid "adm_delete_user_failure_text"
+msgstr ""
+
+#: waskaweb/controllers/administration.py:38
msgid "adm_delete_user_confirm_header"
msgstr ""
-#: waskaweb/controllers/administration.py:35
+#: waskaweb/controllers/administration.py:39
msgid "adm_delete_user_confirm_text"
msgstr ""
-#: waskaweb/controllers/administration.py:37
+#: waskaweb/controllers/administration.py:41
msgid "adm_set_editor_header"
msgstr ""
-#: waskaweb/controllers/administration.py:38
+#: waskaweb/controllers/administration.py:42
msgid "adm_set_editor_success_text"
msgstr ""
-#: waskaweb/controllers/administration.py:39
+#: waskaweb/controllers/administration.py:43
msgid "adm_set_editor_success_text_rest"
msgstr ""
-#: waskaweb/controllers/administration.py:40
+#: waskaweb/controllers/administration.py:44
msgid "adm_set_editor_success_text_head"
msgstr ""
-#: waskaweb/controllers/administration.py:41
+#: waskaweb/controllers/administration.py:45
msgid "adm_set_editor_success_text_rest_head"
msgstr ""
+#: waskaweb/controllers/administration.py:47
+msgid "adm_edit_user_header"
+msgstr ""
+
+#: waskaweb/controllers/administration.py:48
+msgid "adm_edit_user_text"
+msgstr ""
+
+#: waskaweb/controllers/administration.py:50
+msgid "adm_edit_agency_header"
+msgstr ""
+
+#: waskaweb/controllers/administration.py:51
+msgid "adm_edit_agency_text"
+msgstr ""
+
+#: waskaweb/controllers/usersettings.py:22
+msgid "adm_edit_standin_success_header"
+msgstr ""
+
+#: waskaweb/controllers/usersettings.py:23
+msgid "adm_edit_standin_success_text"
+msgstr ""
+
#: waskaweb/lib/renderer.py:208
msgid "cm_rg_aid_overview_table_institution"
msgstr ""
@@ -303,11 +343,17 @@
#: waskaweb/templates/administration/settings.mako:4
#: waskaweb/templates/administration/show_settings.mako:6
#: waskaweb/templates/administration/show_user.mako:5
+#: waskaweb/templates/administration/success_edit_user.mako:5
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:5
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:5
+#: waskaweb/templates/administration/dialogs/failed_delete_user.mako:5
+#: waskaweb/templates/administration/dialogs/failed_new_user.mako:5
#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:5
#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:5
#: waskaweb/templates/administration/dialogs/success_delete_user.mako:5
+#: waskaweb/templates/administration/dialogs/success_edit_agency.mako:5
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:5
+#: waskaweb/templates/statement/dialogs/ee_accept_success.mako:5
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:5
msgid "adm_np_root"
msgstr ""
@@ -319,11 +365,16 @@
#: waskaweb/templates/administration/overview_user.mako:7
#: waskaweb/templates/administration/reset_password.mako:7
#: waskaweb/templates/administration/show_user.mako:6
+#: waskaweb/templates/administration/success_edit_user.mako:6
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:6
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:6
+#: waskaweb/templates/administration/dialogs/failed_delete_user.mako:6
+#: waskaweb/templates/administration/dialogs/failed_new_user.mako:6
#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:6
#: waskaweb/templates/administration/dialogs/notificate_deleteuser.mako:6
#: waskaweb/templates/administration/dialogs/success_delete_user.mako:6
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:6
+#: waskaweb/templates/statement/dialogs/ee_accept_success.mako:6
#: waskaweb/templates/statement/dialogs/ee_decline_success.mako:6
msgid "adm_np_overview"
msgstr ""
@@ -356,10 +407,12 @@
#: waskaweb/templates/administration/edit_settings.mako:6
#: waskaweb/templates/administration/show_settings.mako:7
+#: waskaweb/templates/administration/dialogs/success_edit_agency.mako:6
msgid "adm_np_showsettings"
msgstr ""
#: waskaweb/templates/administration/edit_settings.mako:7
+#: waskaweb/templates/administration/dialogs/success_edit_agency.mako:7
msgid "adm_np_editsettings"
msgstr ""
@@ -402,11 +455,15 @@
#: waskaweb/templates/administration/edit_user.mako:15
#: waskaweb/templates/administration/reset_password.mako:8
#: waskaweb/templates/administration/show_user.mako:7
+#: waskaweb/templates/administration/success_edit_user.mako:7
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:7
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:7
msgid "adm_np_showuser"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:16
+#: waskaweb/templates/administration/success_edit_user.mako:8
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:8
msgid "adm_np_edituser"
msgstr ""
@@ -601,7 +658,7 @@
msgstr ""
#: waskaweb/templates/administration/overview_user.mako:36
-#: waskaweb/templates/administration/overview_user.mako:46
+#: waskaweb/templates/administration/overview_user.mako:48
#: waskaweb/templates/casemanagement/caselist.mako:45
#: waskaweb/templates/casemanagement/caselist.mako:82
#: waskaweb/templates/documents/case_overview.mako:42
@@ -613,8 +670,8 @@
msgid "cm_overview_a_show"
msgstr ""
-#: waskaweb/templates/administration/overview_user.mako:37
-#: waskaweb/templates/administration/overview_user.mako:47
+#: waskaweb/templates/administration/overview_user.mako:38
+#: waskaweb/templates/administration/overview_user.mako:50
#: waskaweb/templates/casemanagement/caselist.mako:47
#: waskaweb/templates/casemanagement/caselist.mako:50
#: waskaweb/templates/casemanagement/caselist.mako:84
@@ -749,6 +806,11 @@
msgid "adm_form_label_new_login_new_pw"
msgstr ""
+#: waskaweb/templates/administration/success_edit_user.mako:9
+#: waskaweb/templates/administration/dialogs/success_edit_user.mako:9
+msgid "adm_np_edituser_success"
+msgstr ""
+
#: waskaweb/templates/administration/userform_body.mako:45
msgid "adm_form_user_passwd"
msgstr ""
@@ -765,6 +827,14 @@
msgid "adm_np_delteuser_success"
msgstr ""
+#: waskaweb/templates/administration/dialogs/failed_delete_user.mako:7
+msgid "adm_np_failed_deleteuser"
+msgstr ""
+
+#: waskaweb/templates/administration/dialogs/failed_new_user.mako:7
+msgid "adm_np_failed_createuser"
+msgstr ""
+
#: waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako:9
msgid "adm_np_deleteuser_helper_set_editor"
msgstr ""
@@ -774,6 +844,10 @@
msgid "adm_np_success_deleteuser"
msgstr ""
+#: waskaweb/templates/administration/dialogs/success_edit_agency.mako:8
+msgid "adm_np_editsettings_success"
+msgstr ""
+
#: waskaweb/templates/appointments/appointment_form.mako:6
msgid "app_form_label_title"
msgstr ""
@@ -975,7 +1049,6 @@
#: waskaweb/templates/documents/case_overview.mako:5
#: waskaweb/templates/documents/dialogs/delete_attachment_success.mako:4
#: waskaweb/templates/documents/dialogs/failed_attachment.mako:4
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:6
msgid "cm_np_select"
msgstr ""
@@ -1001,7 +1074,6 @@
#: waskaweb/templates/casemanagement/dialogs/success_restore.mako:5
#: waskaweb/templates/casemanagement/static_form/statement.mako:5
#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:4
#: waskaweb/templates/statement/dialogs/confirm.mako:5
#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
msgid "cm_np_root"
@@ -1467,7 +1539,6 @@
#: waskaweb/templates/casemanagement/main.mako:11
#: waskaweb/templates/casemanagement/overview.mako:7
#: waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako:5
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:5
#: waskaweb/templates/statement/dialogs/missing_statement.mako:6
msgid "cm_np_overview"
msgstr ""
@@ -1639,7 +1710,7 @@
msgstr ""
#: waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako:5
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:7
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:4
msgid "cm_np_att_overview"
msgstr ""
@@ -1814,7 +1885,7 @@
msgid "cm_np_doc_failed"
msgstr ""
-#: waskaweb/templates/documents/dialogs/success_attachment.mako:8
+#: waskaweb/templates/documents/dialogs/success_attachment.mako:5
msgid "cm_np_attachment_success"
msgstr ""
Modified: trunk/waskaweb/model/navigation.py
===================================================================
--- trunk/waskaweb/model/navigation.py 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/model/navigation.py 2008-08-13 13:08:43 UTC (rev 32)
@@ -165,9 +165,9 @@
make("page_7")("8", "page_7", "Weiterer Verlauf")
]),
make("page_8")("9", "page_8", "Case-Management", [
- make("page_8")("10", "page_8", "Kompetenzfestellung", [
+ make("page_8")("10", "page_8", "Kompetenzfeststellung", [
make("page_8")("11", "page_8", "Verfahren"),
- make("page_9")("12", "page_9", "Ergebnisse der Kompetenzfestellung", [
+ make("page_9")("12", "page_9", "Ergebnisse der Kompetenzfeststellung", [
make("page_9")("31", "page_9", "Fachkompetenzen"),
make("page_26")("32", "page_26", "Methodenkompetenzen"),
make("page_27")("33", "page_27", "Sprachen und Kommunikation"),
Added: trunk/waskaweb/templates/administration/dialogs/failed_delete_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/dialogs/failed_delete_user.mako 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/templates/administration/dialogs/failed_delete_user.mako 2008-08-13 13:08:43 UTC (rev 32)
@@ -0,0 +1,9 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="#">${_('adm_np_failed_deleteuser')}</a></li>
+</%def>
+<%include file="../../dialogs/failed.mako" />
Added: trunk/waskaweb/templates/administration/dialogs/failed_new_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/dialogs/failed_new_user.mako 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/templates/administration/dialogs/failed_new_user.mako 2008-08-13 13:08:43 UTC (rev 32)
@@ -0,0 +1,9 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="#">${_('adm_np_failed_createuser')}</a></li>
+</%def>
+<%include file="../../dialogs/failed.mako" />
Added: trunk/waskaweb/templates/administration/dialogs/success_edit_agency.mako
===================================================================
--- trunk/waskaweb/templates/administration/dialogs/success_edit_agency.mako 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/templates/administration/dialogs/success_edit_agency.mako 2008-08-13 13:08:43 UTC (rev 32)
@@ -0,0 +1,10 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/showSettings">${_('adm_np_showsettings')}</a></li>
+ <li><a href="/administration/editSettings">${_('adm_np_editsettings')}</a></li>
+ <li><a href="#">${_('adm_np_editsettings_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Added: trunk/waskaweb/templates/administration/dialogs/success_edit_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/dialogs/success_edit_user.mako 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/templates/administration/dialogs/success_edit_user.mako 2008-08-13 13:08:43 UTC (rev 32)
@@ -0,0 +1,11 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
+ <li><a href="/administration/editUser">${_('adm_np_edituser')}</a></li>
+ <li><a href="#">${_('adm_np_edituser_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
Modified: trunk/waskaweb/templates/administration/edit_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/edit_user.mako 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/templates/administration/edit_user.mako 2008-08-13 13:08:43 UTC (rev 32)
@@ -70,12 +70,12 @@
<fieldset><legend>${_('adm_form_legend_login')}</legend>
<table>
<tr>
- <td class="label">Login</td>
- <td>${c.uo.getLogin()| h}</td>
+ <td class="label table_header_v table_width_mid_s">Login</td>
+ <td class="table_row_v">${c.uo.getLogin()| h}</td>
</tr>
<tr>
<td class="label">Rolle</td>
- <td>${c.uo.getRole()| h}</td>
+ <td class="table_row_v_2">${c.uo.getRole()| h}</td>
</tr>
<tr>
</table>
Modified: trunk/waskaweb/templates/administration/overview_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/overview_user.mako 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/templates/administration/overview_user.mako 2008-08-13 13:08:43 UTC (rev 32)
@@ -34,7 +34,9 @@
<td>${user.first_name| F.NA, h}</td>
<td>
<a href="/administration/showUser/${user.id}"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
- <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ % if str(user.id) != str(session.get('USER_AUTHORIZED').id):
+ <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ % endif
</td>
</tr>
<% idset = 1 %>
@@ -44,7 +46,9 @@
<td class="table_row_h">${user.first_name| F.NA, h}</td>
<td class="table_row_h">
<a href="/administration/showUser/${user.id}"><img src="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
- <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ % if str(user.id) != str(session.get('USER_AUTHORIZED').id):
+ <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_red.gif" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ % endif
</td>
</tr>
<% idset = 0 %>
Added: trunk/waskaweb/templates/administration/success_edit_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/success_edit_user.mako 2008-08-13 13:08:11 UTC (rev 31)
+++ trunk/waskaweb/templates/administration/success_edit_user.mako 2008-08-13 13:08:43 UTC (rev 32)
@@ -0,0 +1,11 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
+ <li><a href="/administration/editUser">${_('adm_np_edituser')}</a></li>
+ <li><a href="#">${_('adm_np_edituser_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />
More information about the Mpuls-commits
mailing list