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

Timestamp:

21 Dec 2014, 22:17:06 (10 years ago)

Author:

Henrik Bettermann

Message:

Uups, we forgot to index and export the contract user_id which is always the customer_id for contracts.

Location:

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

Files:

• catalog.py (modified) (1 diff)
• contracts.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests/test_export.py (modified) (4 diffs)

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

@@ -131 +131 @@
     last_product_id = grok.index.Field(attribute='last_product_id')
     contract_category = grok.index.Field(attribute='contract_category')
+    user_id = grok.index.Field(attribute='user_id')

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

@@ -117 +117 @@
             return None
 
+    @property
+    def user_id(self):
+        if self.customer is not None:
+            return self.customer.customer_id
+        return
+
     def writeLogMessage(self, view, message):
         return self.__parent__.__parent__.writeLogMessage(view, message)

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

@@ -291 +291 @@
     is_approvable = Attribute('Contract approvable by officer')
     translated_class_name = Attribute('Translatable class name')
+    user_id = Attribute('Id of a user, actually the id of the customer')
 
     contract_id = schema.TextLine(

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

@@ -257 +257 @@
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,state,title\r\n'
-
-            'SampleContract,sample,CON1,,[],,,,\r\n'
+            'product_object,state,title,user_id\r\n'
+
+            'SampleContract,sample,CON1,,[],,,,,\r\n'
             )
         return
@@ -273 +273 @@
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,state,title\r\n'
+            'product_object,state,title,user_id\r\n'
 
             'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
-            'SAM,created,My Contract\r\n',
+            'SAM,created,My Contract,A111111\r\n',
             result
             )
@@ -292 +292 @@
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,state,title\r\n'
+            'product_object,state,title,user_id\r\n'
 
             'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
-            'SAM,created,My Contract\r\n',
+            'SAM,created,My Contract,A111111\r\n',
             result
             )
@@ -311 +311 @@
             'class_name,contract_category,contract_id,document_object,'
             'history,last_product_id,'
-            'product_object,state,title\r\n'
+            'product_object,state,title,user_id\r\n'
 
             'SampleContract,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
-            'SAM,created,My Contract\r\n',
-            result
-            )
-        return
-
+            'SAM,created,My Contract,A111111\r\n',
+            result
+            )
+        return
+