##// END OF EJS Templates
integrations: skip executing EE integrations activated from EE but not present in downgrade at CE.
marcink -
r2460:20bf9c61 default
parent child Browse files
Show More
@@ -30,6 +30,7 b' from sqlalchemy import or_, and_'
30
30
31 import rhodecode
31 import rhodecode
32 from rhodecode import events
32 from rhodecode import events
33 from rhodecode.integrations.types.base import EEIntegration
33 from rhodecode.lib.caching_query import FromCache
34 from rhodecode.lib.caching_query import FromCache
34 from rhodecode.model import BaseModel
35 from rhodecode.model import BaseModel
35 from rhodecode.model.db import Integration, Repository, RepoGroup
36 from rhodecode.model.db import Integration, Repository, RepoGroup
@@ -89,6 +90,11 b' class IntegrationModel(BaseModel):'
89 log.error('No class could be found for integration type: {}'.format(
90 log.error('No class could be found for integration type: {}'.format(
90 integration.integration_type))
91 integration.integration_type))
91 return None
92 return None
93 elif isinstance(TypeClass, EEIntegration) or issubclass(TypeClass, EEIntegration):
94 log.error('EE integration cannot be '
95 'executed for integration type: {}'.format(
96 integration.integration_type))
97 return None
92
98
93 return TypeClass(integration.settings)
99 return TypeClass(integration.settings)
94
100
General Comments 0
You need to be logged in to leave comments. Login now