# HG changeset patch # User Daniel Dourvaris # Date 2016-10-06 14:59:33 # Node ID 839758185a0fc671265bd778c7da8306541f707d # Parent 3d0f257a78027c20600377f377d7c8d72c84272e 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: