[Mpuls-commits] r2646 - in wasko/branches/2.0/mpulsweb: model templates/settings

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-05-05 12:07:20 +0200 (Wed, 05 May 2010)
New Revision: 2646

Modified:
   wasko/branches/2.0/mpulsweb/model/agencysettings.py
   wasko/branches/2.0/mpulsweb/model/statement.py
   wasko/branches/2.0/mpulsweb/templates/settings/edit.mako
   wasko/branches/2.0/mpulsweb/templates/settings/show.mako
Log:
Fixed typo in method name


Modified: wasko/branches/2.0/mpulsweb/model/agencysettings.py
===================================================================
--- wasko/branches/2.0/mpulsweb/model/agencysettings.py	2010-05-05 09:52:18 UTC (rev 2645)
+++ wasko/branches/2.0/mpulsweb/model/agencysettings.py	2010-05-05 10:07:20 UTC (rev 2646)
@@ -98,7 +98,7 @@
     def getName(self):
         return self.conf.get('ka_name', u'')
 
-    def getAdress(self):
+    def getAddress(self):
         return self.conf.get('ka_adresse', u'')
 
     def getMaxSavetime(self):

Modified: wasko/branches/2.0/mpulsweb/model/statement.py
===================================================================
--- wasko/branches/2.0/mpulsweb/model/statement.py	2010-05-05 09:52:18 UTC (rev 2645)
+++ wasko/branches/2.0/mpulsweb/model/statement.py	2010-05-05 10:07:20 UTC (rev 2646)
@@ -73,7 +73,7 @@
             'STRASSENR': escape(F.NA(self.case.streetnr)),
             'ORT': escape(F.NA(self.case.city)),
             'KA_NAME': escape(F.NA(self.agency.getName())),
-            'KA_ADRESSE': escape(F.NA(self.agency.getAdress())),
+            'KA_ADRESSE': escape(F.NA(self.agency.getAddress())),
             'KA_SPEICHERDAUER': escape(F.NA(self.agency.getMaxSavetime()))
             }
         return Template(self.agency.getPrivacyStatement()).safe_substitute(s)

Modified: wasko/branches/2.0/mpulsweb/templates/settings/edit.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/settings/edit.mako	2010-05-05 09:52:18 UTC (rev 2645)
+++ wasko/branches/2.0/mpulsweb/templates/settings/edit.mako	2010-05-05 10:07:20 UTC (rev 2646)
@@ -60,11 +60,11 @@
           <label for="ka_adresse">${_('adm_form_settings_kaadress')}</label>
           % if c.form_errors.get('ka_adresse'):
             <input type="text" class="field error_box" id="ka_adresse"
-                   value="${c.form_result.get('ka_adresse', c.agency.getAdress())|h}"
+                   value="${c.form_result.get('ka_adresse', c.agency.getAddress())|h}"
                    name="ka_adresse" maxlength="120">
           % else:
             <input type="text" class="field" id="ka_adresse" name="ka_adresse"
-                   value="${c.form_result.get('ka_adresse', c.agency.getAdress())|h}"
+                   value="${c.form_result.get('ka_adresse', c.agency.getAddress())|h}"
                    maxlength="120">
           % endif
         </div>

Modified: wasko/branches/2.0/mpulsweb/templates/settings/show.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/settings/show.mako	2010-05-05 09:52:18 UTC (rev 2645)
+++ wasko/branches/2.0/mpulsweb/templates/settings/show.mako	2010-05-05 10:07:20 UTC (rev 2646)
@@ -41,7 +41,7 @@
     <td class="label table_width_name">
       ${_('adm_form_settings_kaadress')}
     </td>
-    <td class="table_description">${c.agency.getAdress()| F.NA}
+    <td class="table_description">${c.agency.getAddress()| F.NA}
     </td>
   </tr>
   <tr>