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

Timestamp:

30 Nov 2014, 21:08:42 (10 years ago)

Author:

Henrik Bettermann

Message:

Renaming batch 3

Location:

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

Files:

• browser.py (modified) (2 diffs)
• browser_templates/contractaddform.pt (modified) (1 diff)
• contracts.py (modified) (2 diffs)
• utils.py (modified) (3 diffs)

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

@@ -1117 +1117 @@
 
     @property
-    def selectable_apptypes(self):
-        apptypes = getUtility(ICustomersUtils).SELECTABLE_APPTYPES_DICT
-        return sorted(apptypes.items())
+    def selectable_contypes(self):
+        contypes = getUtility(ICustomersUtils).SELECTABLE_CONTYPES_DICT
+        return sorted(contypes.items())
 
     @action(_('Create contract'), style='primary')
@@ -1130 +1130 @@
         contract = createObject('waeup.%s' % apptype)
         self.context.addContract(contract)
-        apptype = getUtility(ICustomersUtils).SELECTABLE_APPTYPES_DICT[apptype]
+        apptype = getUtility(ICustomersUtils).SELECTABLE_CONTYPES_DICT[apptype]
         self.flash(_('${a} created.',
             mapping = {'a': apptype}))

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

@@ -10 +10 @@
           <select id="apptype" name="apptype" size="1"
                   class="form-control half">
-            <option tal:repeat="item view/selectable_apptypes"
+            <option tal:repeat="item view/selectable_contypes"
                     tal:attributes="value python:item[0]">
-              <span tal:replace="python:item[1]">APPTYPE</span>
+              <span tal:replace="python:item[1]">CONTYPE</span>
             </option>
           </select>

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

@@ -119 +119 @@
             # Customer must be approved
             cond1 = self.customer.state in getUtility(
-                ICustomersUtils).APPMANAGE_CUSTOMER_STATES
+                ICustomersUtils).CONMANAGE_CUSTOMER_STATES
             # Contract must be in state created
             cond2 = self.state in getUtility(
-                ICustomersUtils).APPMANAGE_CONTRACT_STATES
+                ICustomersUtils).CONMANAGE_CONTRACT_STATES
             if not (cond1 and cond2):
                 return False
@@ -132 +132 @@
     def translated_class_name(self):
         try:
-            APPTYPES_DICT = getUtility(ICustomersUtils).APPTYPES_DICT
-            return APPTYPES_DICT[self.class_name]
+            CONTYPES_DICT = getUtility(ICustomersUtils).CONTYPES_DICT
+            return CONTYPES_DICT[self.class_name]
         except KeyError:
             return

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

@@ -287 +287 @@
     DOCMANAGE_DOCUMENT_STATES = (CREATED,)
 
-    APPMANAGE_CUSTOMER_STATES = DOCMANAGE_CUSTOMER_STATES
-
-    APPMANAGE_CONTRACT_STATES = (CREATED,)
+    CONMANAGE_CUSTOMER_STATES = DOCMANAGE_CUSTOMER_STATES
+
+    CONMANAGE_CONTRACT_STATES = (CREATED,)
 
     SKIP_UPLOAD_VIEWLETS = ()
@@ -314 +314 @@
         }
 
-    APPTYPES_DICT = {
+    CONTYPES_DICT = {
         'SampleContract': 'Sample Contract',
         }
@@ -320 +320 @@
     SELECTABLE_DOCTYPES_DICT = DOCTYPES_DICT
 
-    SELECTABLE_APPTYPES_DICT = APPTYPES_DICT
+    SELECTABLE_CONTYPES_DICT = CONTYPES_DICT
 
     def getPDFCreator(self, context=None):