# HG changeset patch # User Daniel Dourvaris # Date 2016-10-06 14:59:33 # Node ID e4de2770387698407af5ae8da9ef02054597e663 # Parent 5fa43f5fdaa762daab154c11551f22fd7e207646 integrations: fix bug with integrations view page not loading when non global admin tries to access it, fixes #4266 diff --git a/rhodecode/integrations/views.py b/rhodecode/integrations/views.py --- a/rhodecode/integrations/views.py +++ b/rhodecode/integrations/views.py @@ -329,13 +329,14 @@ class IntegrationSettingsViewBase(object integrations = [] - for integration in IntegrationModel().get_integrations( + for IntType, integration in IntegrationModel().get_integrations( scope=scope, IntegrationType=self.IntegrationType): # extra permissions check *just in case* if not self._has_perms_for_integration(integration): continue - integrations.append(integration) + + integrations.append((IntType, integration)) sort_arg = self.request.GET.get('sort', 'name:asc') if ':' in sort_arg: