Changeset 12112 for main/waeup.ikoba/trunk/src/waeup

Timestamp:

2 Dec 2014, 06:51:59 (10 years ago)

Author:

Henrik Bettermann

Message:

Replace 'apptype' by 'contype'.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• browser.py (modified) (1 diff)
• browser_templates/contractaddform.pt (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -1126 +1126 @@
         form = self.request.form
         customer = self.context.__parent__
-        apptype = form.get('apptype', None)
+        contype = form.get('contype', None)
         # Here we can create various instances of Contract derived
-        # classes depending on the apptype parameter given in form.
-        contract = createObject('waeup.%s' % apptype)
+        # classes depending on the contype parameter given in form.
+        contract = createObject('waeup.%s' % contype)
         self.context.addContract(contract)
-        apptype = getUtility(ICustomersUtils).SELECTABLE_CONTYPES_DICT[apptype]
+        contype = getUtility(ICustomersUtils).SELECTABLE_CONTYPES_DICT[contype]
         self.flash(_('${a} created.',
-            mapping = {'a': apptype}))
+            mapping = {'a': contype}))
         self.context.writeLogMessage(
-            self,'added: %s %s' % (apptype, contract.contract_id))
+            self,'added: %s %s' % (contype, contract.contract_id))
         self.redirect(self.url(self.context))
         return

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/contractaddform.pt

@@ -8 +8 @@
         </td>
         <td>
-          <select id="apptype" name="apptype" size="1"
+          <select id="contype" name="contype" size="1"
                   class="form-control half">
             <option tal:repeat="item view/selectable_contypes"

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -1066 +1066 @@
         self.browser.getLink("Contracts").click()
         self.browser.getLink("Add contract").click()
-        self.browser.getControl(name="apptype").value = ['SampleContract']
+        self.browser.getControl(name="contype").value = ['SampleContract']
         self.browser.getControl("Create contract").click()
         self.assertTrue('Sample Contract created.' in self.browser.contents)
@@ -1129 +1129 @@
         self.browser.getLink("Contracts").click()
         self.browser.getLink("Add contract").click()
-        self.browser.getControl(name="apptype").value = ['SampleContract']
+        self.browser.getControl(name="contype").value = ['SampleContract']
         self.browser.getControl("Create contract").click()
         self.assertTrue('Sample Contract created.' in self.browser.contents)