[Mpuls-commits] r2082 - in wasko/branches/2.0: . jmdweb/controllers mpulsweb/templates/administration/dialogs mpulsweb/templates/administration/dialogs/dialogs waskaweb/templates/administration

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-03-23 14:48:00 +0100 (Tue, 23 Mar 2010)
New Revision: 2082

Added:
   wasko/branches/2.0/mpulsweb/templates/administration/dialogs/dialogs/
Removed:
   wasko/branches/2.0/waskaweb/templates/administration/dialogs/
Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/jmdweb/controllers/administration.py
Log:
Moved notifiction dialog on deleting users to mpulsbase.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-23 13:44:29 UTC (rev 2081)
+++ wasko/branches/2.0/ChangeLog	2010-03-23 13:48:00 UTC (rev 2082)
@@ -16,6 +16,11 @@
 	* jmdweb/controllers/case.py (keepActive): Deleted. Now defined in
 	mpulsweb. 
 	* jmdweb/controllers/caseappointment.py: Import all from mpulsweb.
+	* mpulsweb/lib/validators.py (DeleteUserHelperForm): New copied from
+	jmdweb.
+	* jmdweb/controllers/administration.py: Import all from mpulsweb
+	* jmdweb/lib/validators.py (DeleteUserHelperForm): Deleted. Defined in
+	mpulsweb now.
 
 	* mpulsweb/templates/*.mako: Relaced "F.NA | h" with "F.NA". Escaping
 	s now done with default escapping in mako

Modified: wasko/branches/2.0/jmdweb/controllers/administration.py
===================================================================
--- wasko/branches/2.0/jmdweb/controllers/administration.py	2010-03-23 13:44:29 UTC (rev 2081)
+++ wasko/branches/2.0/jmdweb/controllers/administration.py	2010-03-23 13:48:00 UTC (rev 2082)
@@ -42,10 +42,6 @@
 from mpulsweb.model.case import MpulsCaseOverview, MpulsCaseBundle
 from mpulsweb.controllers.administration import AdministrationController as BaseAdministrationController
 
-
-log = logging.getLogger(__name__)
-
-
 DELETE_USER_NOTIFICATION_SUCCESS = _('adm_delete_user_success_header')
 DELETE_USER_NOTIFICATION_TEXT_SUCCESS = _('adm_delete_user_success_text')
 
@@ -64,6 +60,8 @@
 SETEDITOR_NOTIFICATION_SUCCESS_REST_HEAD = \
                                   _('adm_set_editor_success_text_rest_head')
 
+log = logging.getLogger(__name__)
+
 class AdministrationController(BaseAdministrationController):
 
     def index(self):

Copied: wasko/branches/2.0/mpulsweb/templates/administration/dialogs/dialogs (from rev 2056, wasko/branches/2.0/waskaweb/templates/administration/dialogs)


Property changes on: wasko/branches/2.0/mpulsweb/templates/administration/dialogs/dialogs
___________________________________________________________________
Name: svn:ignore
   + *.pyc

Name: svn:mergeinfo
   +