Changeset 12097 for main/waeup.ikoba/trunk/src/waeup/ikoba/products

Timestamp:

30 Nov 2014, 20:49:22 (10 years ago)

Author:

Henrik Bettermann

Message:

The term 'application' should really not be used in Python-based portal software.

Replace 'application' by 'contract': batch 1

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/products

Files:

• interfaces.py (modified) (2 diffs)
• product.py (modified) (1 diff)
• tests/sample_product_data.csv (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)
• tests/test_export.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/products/interfaces.py

@@ -24 +24 @@
 
 class AppCatSource(ContextualDictSourceFactoryBase):
-    """A application category source delivers all application categories
+    """A contract category source delivers all contract categories
     provided in the portal.
     """
@@ -55 +55 @@
         )
 
-    application_category = schema.Choice(
-        title = _(u'Application Category'),
+    contract_category = schema.Choice(
+        title = _(u'Contract Category'),
         source = AppCatSource(),
         default = u'license',

main/waeup.ikoba/trunk/src/waeup/ikoba/products/product.py

@@ -66 +66 @@
 def handle_product_removed(product, event):
     """If a product is deleted, we make sure that also referrers to
-    customer application objects are removed.
+    customer contract objects are removed.
     """
     prodid = product.product_id
 
-    # Find all customer applications that refer to given product...
+    # Find all customer contracts that refer to given product...
     try:
-        cat = getUtility(ICatalog, name='applications_catalog')
+        cat = getUtility(ICatalog, name='contracts_catalog')
     except ComponentLookupError:
         # catalog not available. This might happen during tests.
         return
     results = cat.searchResults(last_product_id=(prodid, prodid))
-    for application in results:
+    for contract in results:
         # Remove that referrer...
-        application.product = None
-        notify(grok.ObjectModifiedEvent(application))
-        application.customer.__parent__.logger.info(
+        contract.product = None
+        notify(grok.ObjectModifiedEvent(contract))
+        contract.customer.__parent__.logger.info(
             'ObjectRemovedEvent - %s - %s - removed: product' % (
-                application.customer.customer_id, application.application_id))
+                contract.customer.customer_id, contract.contract_id))
     return
 

main/waeup.ikoba/trunk/src/waeup/ikoba/products/tests/sample_product_data.csv

@@ -1 @@
-product_id,title,application_category
+product_id,title,contract_category
 ABC,ABC title,license
 CDE,CDE title,license

main/waeup.ikoba/trunk/src/waeup/ikoba/products/tests/test_batching.py

@@ -165 +165 @@
             'INFO - system - Product Processor - sample_product_data - '
             'EFG - updated: product_id=EFG, title=EFG title, '
-            'application_category=license\n'
+            'contract_category=license\n'
             in logcontent)
         failcontent = open(fail_file).read()

main/waeup.ikoba/trunk/src/waeup/ikoba/products/tests/test_export.py

@@ -62 +62 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'application_category,product_id,title,users_with_local_roles\r\n'
+            'contract_category,product_id,title,users_with_local_roles\r\n'
             'license,LIC,Unnamed,"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'
@@ -75 +75 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'application_category,product_id,title,users_with_local_roles\r\n'
+            'contract_category,product_id,title,users_with_local_roles\r\n'
             'license,LIC,Unnamed,"[{\'user_name\': u\'john\', \'local_role\': '
             'u\'johnsrole\'}]"\r\n'