[Mpuls-commits] r4887 - in base/trunk: . mpulsweb/controllers mpulsweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-04-07 16:28:26 +0200 (Thu, 07 Apr 2011)
New Revision: 4887

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/caseappointment.py
   base/trunk/mpulsweb/model/case.py
Log:
* mpulsweb/controllers/caseappointment.py
(CaseappointmentController.newReminder): Adapt to
MpulsCase.getSubject -> MpulsCase.get_subject renaming. This is
the only place where the method is called at the moment anywhere
in the mpuls code base (base and all applications).

* mpulsweb/model/case.py (MpulsCase.getSubject)
(MpulsCase.get_subject): Rename getSubject to get_subject to make
the name conform to mpuls conventions.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-04-07 14:10:28 UTC (rev 4886)
+++ base/trunk/ChangeLog	2011-04-07 14:28:26 UTC (rev 4887)
@@ -1,5 +1,17 @@
 2011-04-07  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/model/case.py (MpulsCase.getSubject)
+	(MpulsCase.get_subject): Rename getSubject to get_subject to make
+	the name conform to mpuls conventions.
+
+	* mpulsweb/controllers/caseappointment.py
+	(CaseappointmentController.newReminder): Adapt to
+	MpulsCase.getSubject -> MpulsCase.get_subject renaming. This is
+	the only place where the method is called at the moment anywhere
+	in the mpuls code base (base and all applications).
+
+2011-04-07  Bernhard Herzog  <bh at intevation.de>
+
 	Fix mpuls/issue1977: use unicode, not str, in MpulsCase.getSubject
 
 	* mpulsweb/model/case.py (MpulsCase.getSubject): Convert the

Modified: base/trunk/mpulsweb/controllers/caseappointment.py
===================================================================
--- base/trunk/mpulsweb/controllers/caseappointment.py	2011-04-07 14:10:28 UTC (rev 4886)
+++ base/trunk/mpulsweb/controllers/caseappointment.py	2011-04-07 14:28:26 UTC (rev 4887)
@@ -63,7 +63,7 @@
         form_defaults = {'start_date': dd_mm_YYYY(cd),
                          'start_time': HH_MM(cd),
                          'case_id': id,
-                         'title': case.getSubject(),
+                         'title': case.get_subject(),
                          'description': (u"Bitte geben Sie den Grund für"
                                          u" die Wiedervorlage ein"),
                          'type': 1}

Modified: base/trunk/mpulsweb/model/case.py
===================================================================
--- base/trunk/mpulsweb/model/case.py	2011-04-07 14:10:28 UTC (rev 4886)
+++ base/trunk/mpulsweb/model/case.py	2011-04-07 14:28:26 UTC (rev 4887)
@@ -864,7 +864,7 @@
         self.formed_instance.setData(data)
         self.formed_instance.commit()
 
-    def getSubject(self):
+    def get_subject(self):
         """Returns a short string identifier for the case built from info fields."""
         values = []
         for f in self.get_infofield_fields():