Changeset 12283 for main/waeup.ikoba/trunk
- Timestamp:
- 21 Dec 2014, 11:26:41 (10 years ago)
- Location:
- main/waeup.ikoba/trunk/src/waeup/ikoba
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.ikoba/trunk/src/waeup/ikoba/browser/pages.py
r12229 r12283 964 964 def getImporters(self): 965 965 importers = getAllUtilitiesRegisteredFor(IBatchProcessor) 966 ikoba_utils = getUtility(IIkobaUtils) 966 967 importer_props = [] 967 968 for x in importers: 969 if not x.util_name in ikoba_utils.BATCH_PROCESSOR_NAMES: 970 continue 968 971 iface_fields = schema.getFields(x.iface) 969 972 available_fields = [] … … 1085 1088 def getImporters(self): 1086 1089 importers = getAllUtilitiesRegisteredFor(IBatchProcessor) 1090 ikoba_utils = getUtility(IIkobaUtils) 1087 1091 importers = sorted( 1088 [dict(title=x.name, name=x.util_name) for x in importers]) 1092 [dict(title=x.name, name=x.util_name) for x in importers 1093 if x.util_name in ikoba_utils.BATCH_PROCESSOR_NAMES]) 1089 1094 return importers 1090 1095 … … 1439 1444 1440 1445 def getExporters(self): 1441 utils = getUtilitiesFor(ICSVExporter) 1446 exporter_utils = getUtilitiesFor(ICSVExporter) 1447 ikoba_utils = getUtility(IIkobaUtils) 1442 1448 title_name_tuples = [ 1443 (util.title, name) for name, util in utils] 1449 (util.title, name) for name, util in exporter_utils 1450 if name in ikoba_utils.EXPORTER_NAMES] 1444 1451 return sorted(title_name_tuples) 1445 1452 -
main/waeup.ikoba/trunk/src/waeup/ikoba/customers/batching.py
r12281 r12283 560 560 grok.name(util_name) 561 561 562 name = _(' Sample Contract Processor')562 name = _('Customer Sample Contract Processor') 563 563 iface = ISampleContract 564 564 factory_name = 'waeup.SampleContract' -
main/waeup.ikoba/trunk/src/waeup/ikoba/customers/export.py
r12280 r12283 247 247 iface = ISampleContract 248 248 class_name = 'SampleContract' 249 title = _(u' Sample Contracts')249 title = _(u'Customer Sample Contracts') -
main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py
r12281 r12283 502 502 if len(i) > 10][0] 503 503 self.assertTrue( 504 'INFO - system - Sample Contract Processor - sample_contract_data - '504 'INFO - system - Customer Sample Contract Processor - sample_contract_data - ' 505 505 'X666666 - %s - updated: title=My 4th contract, ' 506 506 'product_object=SAM, document_object=DOC1' % conid -
main/waeup.ikoba/trunk/src/waeup/ikoba/utils/utils.py
r12192 r12283 29 29 from waeup.ikoba.smtp import send_mail as send_mail_internally 30 30 from waeup.ikoba.utils.helpers import get_sorted_preferred 31 from waeup.ikoba.customers.export import EXPORTER_NAMES as CUSTOMER_EXPORTER_NAMES 31 32 32 33 … … 137 138 'cpu-load': 100.0, 138 139 } 140 141 EXPORTER_NAMES = CUSTOMER_EXPORTER_NAMES + ( 142 'pdfdocuments', 143 'htmldocuments', 144 'users', 145 'products') 146 147 BATCH_PROCESSOR_NAMES = ( 148 'customerprocessor', 149 'customersampledocumentprocessor', 150 'samplecontractprocessor', 151 'productprocessor', 152 'pdfdocumentprocessor', 153 'htmldocumentprocessor', 154 'userprocessor') 139 155 140 156 def sendContactForm(self, from_name, from_addr, rcpt_name, rcpt_addr,
Note: See TracChangeset for help on using the changeset viewer.