Version Bump v2.6.3

Update Translations from Transifex

See merge request allianceauth/allianceauth!1190

.gitignore

@@ -64,5 +64,11 @@ celerybeat-schedule
 .idea/*
 /nbproject/
 
+#VSCode
+.vscode/
+
 #gitlab configs
 .gitlab/
+
+#transifex
+.tx/

.gitlab-ci.yml

@@ -6,20 +6,45 @@ before_script:
 - python -V
 - pip install wheel tox
 
-test-3.5:
-  image: python:3.5-stretch
+test-3.5-core:
+  image: python:3.5-buster
   script:  
-  - tox -e py35
+  - tox -e py35-core
 
-test-3.6:
-  image: python:3.6-stretch
+test-3.6-core:
+  image: python:3.6-buster
   script:  
-  - tox -e py36
+  - tox -e py36-core
 
-test-3.7:
-  image: python:3.7-stretch
+test-3.7-core:
+  image: python:3.7-buster
   script:  
-  - tox -e py37
+  - tox -e py37-core
+
+test-3.8-core:
+  image: python:3.8-buster
+  script:  
+  - tox -e py38-core
+
+test-3.5-all:
+  image: python:3.5-buster
+  script:  
+  - tox -e py35-all
+
+test-3.6-all:
+  image: python:3.6-buster
+  script:  
+  - tox -e py36-all
+
+test-3.7-all:
+  image: python:3.7-buster
+  script:  
+  - tox -e py37-all
+
+test-3.8-all:
+  image: python:3.8-buster
+  script:  
+  - tox -e py38-all
 
 deploy_production:
   stage: deploy

.travis.yml

@@ -1,25 +0,0 @@
-language: python
-sudo: false
-cache: pip
-dist: trusty
-install:
-  - pip install coveralls>=1.1 tox
-# command to run tests
-script:
-  - tox
-after_success:
-  coveralls
-matrix:
-  include:
-   - env: TOXENV=py35-dj111
-     python: '3.5'
-   - env: TOXENV=py36-dj111
-     python: '3.6'
-   - env: TOXENV=py35-dj20
-     python: '3.5'
-   - env: TOXENV=py36-dj20
-     python: '3.6'
-   - env: TOXENV=py37-dj20
-     python: '3.7-dev'
-  allow_failures:
-  - env: TOXENV=py37-dj20

README.md

@@ -11,32 +11,34 @@
 
 An auth system for EVE Online to help in-game organizations manage online service access.
 
-## Contens
+## Content
 
 - [Overview](#overview)
 - [Documentation](http://allianceauth.rtfd.io)
 - [Support](#support)
 - [Release Notes](https://gitlab.com/allianceauth/allianceauth/-/releases)
-- [Devloper Team](#developer-team)
+- [Developer Team](#developer-team)
 - [Contributing](#contributing)
 
 ## Overview
 
-Alliance Auth (AA) is a web application that helps Eve Online organizations efficiently manage access to their applications and services.
+Alliance Auth (AA) is a web site that helps Eve Online organizations efficiently manage access to applications and services.
 
 Main features:
 
-- Automatically grants or revokes user access to external applications / services (e.g. Discord, Mumble) and web apps (e.g. SRP requests) based on the user's current membership to [in-game organizations](https://allianceauth.readthedocs.io/en/latest/features/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/groups/)
+- Automatically grants or revokes user access to external services (e.g. Discord, Mumble) and web apps (e.g. SRP requests) based on the user's current membership to [in-game organizations](https://allianceauth.readthedocs.io/en/latest/features/core/states/) and [groups](https://allianceauth.readthedocs.io/en/latest/features/core/groups/)
 
 - Provides a central web site where users can directly access web apps (e.g. SRP requests, Fleet Schedule) and manage their access to external services and groups.
 
-- Includes a set of connectors (called ["services"](https://allianceauth.readthedocs.io/en/latest/installation/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
+- Includes a set of connectors (called ["services"](https://allianceauth.readthedocs.io/en/latest/features/services/)) for integrating access management with many popular external applications / services like Discord, Mumble, Teamspeak 3, SMF and others
 
-- Includes a set of web apps called ["plug-in apps"](https://allianceauth.readthedocs.io/en/latest/features/) which add many useful functions: fleet schedule, timer board, SRP request management, fleet activity tracker and character application management
+- Includes a set of web [apps](https://allianceauth.readthedocs.io/en/latest/features/apps/) which add many useful functions, e.g.: fleet schedule, timer board, SRP request management, fleet activity tracker
 
-- Can be easily extended with new services and plugin-apps. Many additional services and plugin-apps are provided by the community and can be found here: [Community Creations](https://gitlab.com/allianceauth/community-creations)
+- Can be easily extended with additional services and apps. Many are provided by the community and can be found here: [Community Creations](https://gitlab.com/allianceauth/community-creations)
 
-For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [offical documentation](http://allianceauth.rtfd.io).
+- Chinese :cn:, English :us:, German :de: and Spanish :es: localization
+
+For further details about AA - including an installation guide and a full list of included services and plugin apps - please see the [official documentation](http://allianceauth.rtfd.io).
 
 ## Screenshot
 

allianceauth/__init__.py

@@ -1,6 +1,6 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '2.5.0'
+__version__ = '2.6.3'
 NAME = 'Alliance Auth v%s' % __version__
 default_app_config = 'allianceauth.apps.AllianceAuthConfig'

allianceauth/authentication/admin.py

@@ -1,15 +1,33 @@
+from django.conf import settings
+
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.models import User as BaseUser, Permission as BasePermission
-from django.utils.text import slugify
-from django.db.models import Q
+from django.contrib.auth.models import User as BaseUser, \
+    Permission as BasePermission, Group
+from django.db.models import Q, F
 from allianceauth.services.hooks import ServicesHook
-from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed
+from django.db.models.signals import pre_save, post_save, pre_delete, \
+    post_delete, m2m_changed
+from django.db.models.functions import Lower
 from django.dispatch import receiver
-from allianceauth.authentication.models import State, get_guest_state, CharacterOwnership, UserProfile, OwnershipRecord
-from allianceauth.hooks import get_hooks
-from allianceauth.eveonline.models import EveCharacter
 from django.forms import ModelForm
+from django.utils.html import format_html
+from django.urls import reverse
+from django.utils.text import slugify
+
+from allianceauth.authentication.models import State, get_guest_state,\
+    CharacterOwnership, UserProfile, OwnershipRecord
+from allianceauth.hooks import get_hooks
+from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo,\
+    EveAllianceInfo
+from allianceauth.eveonline.tasks import update_character
+from .app_settings import AUTHENTICATION_ADMIN_USERS_MAX_GROUPS, \
+    AUTHENTICATION_ADMIN_USERS_MAX_CHARS
+
+if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
+    _has_auto_groups = True    
+else:
+    _has_auto_groups = False
 
 
 def make_service_hooks_update_groups_action(service):
@@ -83,41 +101,324 @@ class UserProfileInline(admin.StackedInline):
         return False
 
 
+def user_profile_pic(obj):
+    """profile pic column data for user objects
+
+    works for both User objects and objects with `user` as FK to User
+    To be used for all user based admin lists (requires CSS)
+    """
+    user_obj = obj.user if hasattr(obj, 'user') else obj
+    if user_obj.profile.main_character:
+        return format_html(
+            '<img src="{}" class="img-circle">',
+            user_obj.profile.main_character.portrait_url(size=32)
+        )
+    else:
+        return None
+user_profile_pic.short_description = ''
+
+
+def user_username(obj):
+    """user column data for user objects
+
+    works for both User objects and objects with `user` as FK to User
+    To be used for all user based admin lists
+    """    
+    link = reverse(
+        'admin:{}_{}_change'.format(
+            obj._meta.app_label,
+            type(obj).__name__.lower()
+        ), 
+        args=(obj.pk,)
+    )
+    user_obj = obj.user if hasattr(obj, 'user') else obj
+    if user_obj.profile.main_character:
+        return format_html(
+            '<strong><a href="{}">{}</a></strong><br>{}',
+            link, 
+            user_obj.username,
+            user_obj.profile.main_character.character_name
+        )
+    else:
+        return format_html(
+            '<strong><a href="{}">{}</a></strong>',
+            link, 
+            user_obj.username,
+        )
+
+user_username.short_description = 'user / main'
+user_username.admin_order_field = 'username'
+
+
+def user_main_organization(obj):
+    """main organization column data for user objects
+
+    works for both User objects and objects with `user` as FK to User
+    To be used for all user based admin lists
+    """
+    user_obj = obj.user if hasattr(obj, 'user') else obj
+    if not user_obj.profile.main_character:
+        result = None
+    else:        
+        corporation = user_obj.profile.main_character.corporation_name
+        if user_obj.profile.main_character.alliance_id:        
+            result = format_html('{}<br>{}',
+                corporation, 
+                user_obj.profile.main_character.alliance_name
+            )
+        else:
+            result = corporation    
+    return result
+
+user_main_organization.short_description = 'Corporation / Alliance (Main)'
+user_main_organization.admin_order_field = \
+    'profile__main_character__corporation_name'
+
+
+class MainCorporationsFilter(admin.SimpleListFilter):
+    """Custom filter to filter on corporations from mains only
+
+    works for both User objects and objects with `user` as FK to User
+    To be used for all user based admin lists
+    """
+    title = 'corporation'
+    parameter_name = 'main_corporation_id__exact'
+
+    def lookups(self, request, model_admin):
+        qs = EveCharacter.objects\
+            .exclude(userprofile=None)\
+            .values('corporation_id', 'corporation_name')\
+            .distinct()\
+            .order_by(Lower('corporation_name'))
+        return tuple(
+            [(x['corporation_id'], x['corporation_name']) for x in qs]
+        )
+
+    def queryset(self, request, qs):
+        if self.value() is None:
+            return qs.all()
+        else:    
+            if qs.model == User:
+                return qs\
+                    .filter(profile__main_character__corporation_id=\
+                        self.value())
+            else:
+                return qs\
+                    .filter(user__profile__main_character__corporation_id=\
+                        self.value())
+            
+
+class MainAllianceFilter(admin.SimpleListFilter):
+    """Custom filter to filter on alliances from mains only
+
+    works for both User objects and objects with `user` as FK to User
+    To be used for all user based admin lists
+    """
+    title = 'alliance'
+    parameter_name = 'main_alliance_id__exact'
+
+    def lookups(self, request, model_admin):
+        qs = EveCharacter.objects\
+            .exclude(alliance_id=None)\
+            .exclude(userprofile=None)\
+            .values('alliance_id', 'alliance_name')\
+            .distinct()\
+            .order_by(Lower('alliance_name'))
+        return tuple(
+            [(x['alliance_id'], x['alliance_name']) for x in qs]
+        )
+
+    def queryset(self, request, qs):
+        if self.value() is None:
+            return qs.all()
+        else:    
+            if qs.model == User:
+                return qs\
+                    .filter(profile__main_character__alliance_id=self.value())                
+            else:
+                return qs\
+                    .filter(user__profile__main_character__alliance_id=\
+                        self.value())
+                
+
+def update_main_character_model(modeladmin, request, queryset):    
+    tasks_count = 0
+    for obj in queryset:
+        if obj.profile.main_character:
+            update_character.delay(obj.profile.main_character.character_id)
+            tasks_count += 1
+
+    modeladmin.message_user(
+        request, 
+        'Update from ESI started for {} characters'.format(tasks_count)
+    )
+
+update_main_character_model.short_description = \
+    'Update main character model from ESI'
+
+
 class UserAdmin(BaseUserAdmin):
+    """Extending Django's UserAdmin model
+    
+    Behavior of groups and characters columns can be configured via settings
+
     """
-    Extending Django's UserAdmin model
-    """
+
+    class Media:
+        css = {
+            "all": ("authentication/css/admin.css",)
+        }
+         
+    class RealGroupsFilter(admin.SimpleListFilter):
+        """Custom filter to get groups w/o Autogroups"""
+        title = 'group'
+        parameter_name = 'group_id__exact'
+
+        def lookups(self, request, model_admin):
+            qs = Group.objects.all().order_by(Lower('name'))
+            if _has_auto_groups:
+                qs = qs\
+                    .filter(managedalliancegroup__isnull=True)\
+                    .filter(managedcorpgroup__isnull=True)                
+            return tuple([(x.pk, x.name) for x in qs])
+
+        def queryset(self, request, queryset):
+            if self.value() is None:
+                return queryset.all()
+            else:    
+                return queryset.filter(groups__pk=self.value())
+
     def get_actions(self, request):
         actions = super(BaseUserAdmin, self).get_actions(request)
 
+        actions[update_main_character_model.__name__] = (
+            update_main_character_model, 
+            update_main_character_model.__name__, 
+            update_main_character_model.short_description
+        )
+
         for hook in get_hooks('services_hook'):
             svc = hook()
             # Check update_groups is redefined/overloaded
             if svc.update_groups.__module__ != ServicesHook.update_groups.__module__:
                 action = make_service_hooks_update_groups_action(svc)
-                actions[action.__name__] = (action,
-                                            action.__name__,
-                                            action.short_description)
+                actions[action.__name__] = (
+                    action, 
+                    action.__name__,
+                    action.short_description
+                )
+            
             # Create sync nickname action if service implements it
             if svc.sync_nickname.__module__ != ServicesHook.sync_nickname.__module__:
                 action = make_service_hooks_sync_nickname_action(svc)
-                actions[action.__name__] = (action,
-                                            action.__name__,
-                                            action.short_description)
-
+                actions[action.__name__] = (
+                    action, action.__name__, 
+                    action.short_description
+                )
         return actions
-    list_filter = BaseUserAdmin.list_filter + ('profile__state',)
+
+    def _list_2_html_w_tooltips(self, my_items: list, max_items: int) -> str:    
+        """converts list of strings into HTML with cutoff and tooltip"""
+        items_truncated_str = ', '.join(my_items[:max_items])
+        if not my_items:
+            result = None
+        elif len(my_items) <= max_items:
+            result = items_truncated_str
+        else:
+            items_truncated_str += ', (...)'
+            items_all_str = ', '.join(my_items)
+            result = format_html(
+                '<span data-tooltip="{}" class="tooltip">{}</span>',
+                items_all_str,
+                items_truncated_str
+            )
+        return result
+    
     inlines = BaseUserAdmin.inlines + [UserProfileInline]
-    list_display = ('username', 'email', 'get_main_character', 'get_state', 'is_active')
 
-    def get_main_character(self, obj):
-        return obj.profile.main_character
-    get_main_character.short_description = "Main Character"
+    ordering = ('username', )
+    list_select_related = True
+    show_full_result_count = True 
+    
+    list_display = (
+        user_profile_pic,
+        user_username, 
+        '_state', 
+        '_groups',
+        user_main_organization,
+        '_characters',
+        'is_active',
+        'date_joined',
+        '_role'
+    )    
+    list_display_links = None
 
-    def get_state(self, obj):
-        return obj.profile.state
-    get_state.short_description = "State"
+    list_filter = ( 
+        'profile__state',
+        RealGroupsFilter,        
+        MainCorporationsFilter,        
+        MainAllianceFilter,
+        'is_active',
+        'date_joined',
+        'is_staff',
+        'is_superuser'
+    )
+    search_fields = (
+        'username', 
+        'character_ownerships__character__character_name'
+    )
+    
+    def _characters(self, obj):
+        my_characters = [
+            x.character.character_name 
+            for x in CharacterOwnership.objects\
+                .filter(user=obj)\
+                .order_by('character__character_name')\
+                .select_related()
+        ]
+        return self._list_2_html_w_tooltips(
+            my_characters, 
+            AUTHENTICATION_ADMIN_USERS_MAX_CHARS
+        )
+          
+    _characters.short_description = 'characters'
+    
 
+    def _state(self, obj):
+        return obj.profile.state.name
+    
+    _state.short_description = 'state'
+    _state.admin_order_field = 'profile__state'
+
+    def _groups(self, obj):
+        if not _has_auto_groups:
+            my_groups = [x.name for x in obj.groups.order_by('name')]
+        else:
+            my_groups = [
+                x.name for x in obj.groups\
+                    .filter(managedalliancegroup__isnull=True)\
+                    .filter(managedcorpgroup__isnull=True)\
+                    .order_by('name')
+            ]
+        
+        return self._list_2_html_w_tooltips(
+            my_groups, 
+            AUTHENTICATION_ADMIN_USERS_MAX_GROUPS
+        )
+       
+    _groups.short_description = 'groups'
+
+    def _role(self, obj):
+        if obj.is_superuser:
+            role = 'Superuser'
+        elif obj.is_staff:
+            role = 'Staff'
+        else:
+            role = 'User'        
+        return role
+    
+    _role.short_description = 'role'
+    
     def has_change_permission(self, request, obj=None):
         return request.user.has_perm('auth.change_user')
 
@@ -127,19 +428,54 @@ class UserAdmin(BaseUserAdmin):
     def has_delete_permission(self, request, obj=None):
         return request.user.has_perm('auth.delete_user')
 
+    def formfield_for_manytomany(self, db_field, request, **kwargs):
+        """overriding this formfield to have sorted lists in the form"""
+        if db_field.name == "groups":
+            kwargs["queryset"] = Group.objects.all().order_by(Lower('name'))
+        return super().formfield_for_manytomany(db_field, request, **kwargs)
+
 
 @admin.register(State)
-class StateAdmin(admin.ModelAdmin):
+class StateAdmin(admin.ModelAdmin):    
+    list_select_related = True
+    list_display = ('name', 'priority', '_user_count')
+    
+    def _user_count(self, obj):
+        return obj.userprofile_set.all().count()
+    _user_count.short_description = 'Users'
+
     fieldsets = (
         (None, {
             'fields': ('name', 'permissions', 'priority'),
         }),
         ('Membership', {
-            'fields': ('public', 'member_characters', 'member_corporations', 'member_alliances'),
+            'fields': (
+                'public', 
+                'member_characters', 
+                'member_corporations', 
+                'member_alliances'
+            ),
         })
     )
-    filter_horizontal = ['member_characters', 'member_corporations', 'member_alliances', 'permissions']
-    list_display = ('name', 'priority', 'user_count')
+    filter_horizontal = [
+        'member_characters', 
+        'member_corporations', 
+        'member_alliances', 
+        'permissions'
+    ]
+
+    def formfield_for_manytomany(self, db_field, request, **kwargs):
+        """overriding this formfield to have sorted lists in the form"""
+        if db_field.name == "member_characters":
+            kwargs["queryset"] = EveCharacter.objects.all()\
+                .order_by(Lower('character_name'))
+        elif db_field.name == "member_corporations":
+            kwargs["queryset"] = EveCorporationInfo.objects.all()\
+                .order_by(Lower('corporation_name'))
+        elif db_field.name == "member_alliances":
+            kwargs["queryset"] = EveAllianceInfo.objects.all()\
+                .order_by(Lower('alliance_name'))
+        return super().formfield_for_manytomany(db_field, request, **kwargs)
 
     def has_delete_permission(self, request, obj=None):
         if obj == get_guest_state():
@@ -154,15 +490,31 @@ class StateAdmin(admin.ModelAdmin):
                 }),
             )
         return super(StateAdmin, self).get_fieldsets(request, obj=obj)
-
-    @staticmethod
-    def user_count(obj):
-        return obj.userprofile_set.all().count()
-
+    
 
 class BaseOwnershipAdmin(admin.ModelAdmin):
-    list_display = ('user', 'character')
-    search_fields = ('user__username', 'character__character_name', 'character__corporation_name', 'character__alliance_name')
+    class Media:
+        css = {
+            "all": ("authentication/css/admin.css",)
+        }
+     
+    list_select_related = True
+    list_display = (
+        user_profile_pic,
+        user_username,
+        user_main_organization,
+        'character',
+    )
+    search_fields = (
+        'user__username', 
+        'character__character_name', 
+        'character__corporation_name', 
+        'character__alliance_name'
+    )
+    list_filter = (                 
+        MainCorporationsFilter,        
+        MainAllianceFilter,
+    )
 
     def get_readonly_fields(self, request, obj=None):
         if obj and obj.pk:

allianceauth/authentication/app_settings.py

@@ -0,0 +1,46 @@
+from django.conf import settings
+
+
+def _clean_setting(
+    name: str,     
+    default_value: object,         
+    min_value: int = None,
+    max_value: int = None,
+    required_type: type = None
+):
+    """cleans the input for a custom setting
+    
+    Will use `default_value` if settings does not exit or has the wrong type
+    or is outside define boundaries (for int only)
+
+    Need to define `required_type` if `default_value` is `None`
+
+    Will assume `min_value` of 0 for int (can be overriden)
+
+    Returns cleaned value for setting
+    """                
+    if default_value is None and not required_type:
+        raise ValueError('You must specify a required_type for None defaults')
+    
+    if not required_type:
+        required_type = type(default_value)
+
+    if min_value is None and required_type == int:
+        min_value = 0        
+        
+    if (hasattr(settings, name)
+        and isinstance(getattr(settings, name), required_type)
+        and (min_value is None or getattr(settings, name) >= min_value)
+        and (max_value is None or getattr(settings, name) <= max_value)
+    ):        
+        return getattr(settings, name)    
+    else:
+        return default_value
+
+
+AUTHENTICATION_ADMIN_USERS_MAX_GROUPS = \
+    _clean_setting('AUTHENTICATION_ADMIN_USERS_MAX_GROUPS', 10)
+
+AUTHENTICATION_ADMIN_USERS_MAX_CHARS = \
+    _clean_setting('AUTHENTICATION_ADMIN_USERS_MAX_CHARS', 5)
+

allianceauth/authentication/static/authentication/css/admin.css

@@ -0,0 +1,29 @@
+/* 
+CSS for allianceauth admin site 
+*/
+
+/* styling for profile pic */
+.img-circle { 
+    border-radius: 50%; 
+}
+.column-user_profile_pic {     
+    width: 1px;
+    white-space: nowrap;
+}
+
+/* tooltip */
+.tooltip {
+    position: relative ;
+}
+.tooltip:hover::after {
+    content: attr(data-tooltip) ;
+    position: absolute ;
+    top: 1.1em ;
+    left: 1em ;
+    min-width: 200px ;
+    border: 1px #808080 solid ;
+    padding: 8px ;
+    color: black ;
+    background-color: rgb(255, 255, 204) ;
+    z-index: 1 ;
+} 

allianceauth/authentication/templates/authentication/dashboard.html

@@ -10,77 +10,99 @@
         {% include 'allianceauth/admin-status/include.html' %}
     {% endif %}
     <div class="col-sm-12">
-        <div class="row vertical-flexbox-row">
+        <div class="row vertical-flexbox-row2">
             <div class="col-sm-6 text-center">
                 <div class="panel panel-primary" style="height:100%">
-                    <div class="panel-heading"><h3 class="panel-title">{% trans "Main Character" %}</h3></div>
+                    <div class="panel-heading">
+                        <h3 class="panel-title">{% trans "Main Character" %}</h3>
+                    </div>
                     <div class="panel-body">
                         {% if request.user.profile.main_character %}
-                        {% with request.user.profile.main_character as main %}
-                        <div class="col-lg-4 col-sm-2">
-                            <table class="table">
-                                <tr>
-                                    <td class="text-center">
-                                        <img class="ra-avatar"src="{{ main.portrait_url_128 }}">
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="text-center">{{ main.character_name }}</td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="col-lg-4 col-sm-2">
-                            <table class="table">
-                                <tr>
-                                    <td class="text-center">
-                                        <img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="text-center">{{ main.corporation_name }}</td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="col-lg-4 col-sm-2">
-                            {% if main.alliance_id %}
-                            <table class="table">
-                                <tr>
-                                    <td class="text-center">
-                                        <img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="text-center">{{ main.alliance_name }}</td>
-                                <tr>
-                            </table>
-                            {% endif %}
-                        </div>
-                        {% endwith %}
+                            {% with request.user.profile.main_character as main %}
+                                <div class="hidden-xs">
+                                    <div class="col-lg-4 col-sm-2">
+                                        <table class="table">
+                                            <tr>
+                                                <td class="text-center">
+                                                    <img class="ra-avatar"src="{{ main.portrait_url_128 }}">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td class="text-center">{{ main.character_name }}</td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                    <div class="col-lg-4 col-sm-2">
+                                        <table class="table">
+                                            <tr>
+                                                <td class="text-center">
+                                                    <img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td class="text-center">{{ main.corporation_name }}</td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                    <div class="col-lg-4 col-sm-2">
+                                        {% if main.alliance_id %}
+                                            <table class="table">
+                                                <tr>
+                                                    <td class="text-center">
+                                                        <img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="text-center">{{ main.alliance_name }}</td>
+                                                <tr>
+                                            </table>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                                <div class="table visible-xs-block">                        
+                                    <p>
+                                        <img class="ra-avatar" src="{{ main.portrait_url_64 }}">
+                                        <img class="ra-avatar" src="{{ main.corporation_logo_url_64 }}">
+                                        <img class="ra-avatar" src="{{ main.alliance_logo_url_64 }}">
+                                    </p>
+                                    <p>
+                                        <strong>{{ main.character_name }}</strong><br>
+                                        {{ main.corporation_name }}<br>
+                                        {{ main.alliance_name }}
+                                    </p>
+                                </div>                                
+                            {% endwith %}
                         {% else %}
-                        <div class="alert alert-danger" role="alert">{% trans "No main character set." %}</div>
+                            <div class="alert alert-danger" role="alert">
+                                {% trans "No main character set." %}
+                            </div>
                         {% endif %}
                         <div class="clearfix"></div>
-                        <div class="col-xs-6">
-                            <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
-                               title="Add Character">{% trans 'Add Character' %}</a>
-                        </div>
-                        <div class="col-xs-6">
-                            <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
-                               title="Change Main Character">{% trans "Change Main" %}</a>
+                        <div class="row">
+                            <div class="col-sm-6 button-wrapper">
+                                <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
+                                title="Add Character">{% trans 'Add Character' %}</a>
+                            </div>
+                            <div class="col-sm-6 button-wrapper">
+                                <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
+                                title="Change Main Character">{% trans "Change Main" %}</a>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="col-sm-6 text-center">
                 <div class="panel panel-success" style="height:100%">
-                    <div class="panel-heading"><h3 class="panel-title">{% trans "Groups" %}</h3></div>
+                    <div class="panel-heading">
+                        <h3 class="panel-title">{% trans "Group Memberships" %}</h3>
+                    </div>
                     <div class="panel-body">
                         <div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
-                            <table class="table table-striped">
-                                {% for group in user.groups.all %}
-                                <tr>
-                                    <td>{{ group.name }}</td>
-                                </tr>
+                            <table class="table table-aa">
+                                {% for group in groups %}
+                                    <tr>
+                                        <td>{{ group.name }}</td>
+                                    </tr>
                                 {% endfor %}
                             </table>
                         </div>
@@ -90,26 +112,50 @@
         </div>
         <div class="clearfix"></div>
         <div class="panel panel-default">
-            <div class="panel-heading" style="display:flex;"><h3 class="panel-title">{% trans 'Characters' %}</h3></div>
-            <div class="panel-body">
-                <table class="table table-hover">
-                    <tr>
-                        <th class="text-center"></th>
-                        <th class="text-center">{% trans 'Name' %}</th>
-                        <th class="text-center">{% trans 'Corp' %}</th>
-                        <th class="text-center">{% trans 'Alliance' %}</th>
-                    </tr>
-                    {% for ownership in request.user.character_ownerships.all %}
-                    {% with ownership.character as char %}
-                    <tr>
-                        <td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
-                        </td>
-                        <td class="text-center">{{ char.character_name }}</td>
-                        <td class="text-center">{{ char.corporation_name }}</td>
-                        <td class="text-center">{{ char.alliance_name }}</td>
-                    </tr>
-                    {% endwith %}
-                    {% endfor %}
+            <div class="panel-heading">
+                <h3 class="panel-title text-center" style="text-align: center">
+                    {% trans 'Characters' %}
+                </h3>
+            </div>
+            <div class="panel-body">                
+                <table class="table table-aa hidden-xs">
+                    <thead>
+                        <tr>
+                            <th class="text-center"></th>
+                            <th class="text-center">{% trans 'Name' %}</th>
+                            <th class="text-center">{% trans 'Corp' %}</th>
+                            <th class="text-center">{% trans 'Alliance' %}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for char in characters %}                            
+                            <tr>
+                                <td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
+                                </td>
+                                <td class="text-center">{{ char.character_name }}</td>
+                                <td class="text-center">{{ char.corporation_name }}</td>
+                                <td class="text-center">{{ char.alliance_name }}</td>
+                            </tr>                        
+                        {% endfor %}
+                    </tbody>
+                </table>
+                <table class="table table-aa visible-xs-block" style="width: 100%">
+                    <tbody>
+                        {% for ownership in request.user.character_ownerships.all %}
+                            {% with ownership.character as char %}
+                                <tr>
+                                    <td class="text-center" style="vertical-align: middle">
+                                        <img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
+                                    </td>
+                                    <td class="text-center" style="vertical-align: middle; width: 100%">
+                                        <strong>{{ char.character_name }}</strong><br>
+                                        {{ char.corporation_name }}<br>
+                                        {{ char.alliance_name|default:"" }}
+                                    </td> 
+                                </tr>
+                            {% endwith %}
+                        {% endfor %}
+                    </tbody>
                 </table>
             </div>
         </div>

allianceauth/authentication/templates/public/login.html

@@ -1,10 +1,8 @@
 {% extends 'public/middle_box.html' %}
 {% load static %}
 {% block page_title %}Login{% endblock %}
-{% block middle_box_content %}
-    <p style="text-align:center">
-        <a href="{% url 'auth_sso_login' %}">
-            <img src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
-        </a>
-    </p>
+{% block middle_box_content %}    
+    <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}">
+        <img class="img-responsive center-block" src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
+    </a>
 {% endblock %}

allianceauth/authentication/templates/registration/activation_email.txt

@@ -1,6 +1,10 @@
 You're receiving this email because someone has entered this email address while registering for an account on {{ site.domain }}
 
-If this was you, please go to the following URL to confirm your email address:
+If this was you, please click on the link below to confirm your email address:
+
+<a href="{{ scheme }}://{{ url }}">Confirm email address</a>
+
+Link not working? Try copy/pasting this URL into your browser:
 
 {{ scheme }}://{{ url }}
 

allianceauth/authentication/templates/registration/password_reset_email.html

@@ -1,5 +1,5 @@
 {% load i18n %}{% autoescape off %}
-    {% blocktrans %}You're receiving this email because you requested a password reset for your
+    {% blocktrans trimmed %}You're receiving this email because you requested a password reset for your
         user account.{% endblocktrans %}
 
     {% trans "Please go to the following page and choose a new password:" %}

allianceauth/authentication/tests/__init__.py

@@ -0,0 +1,18 @@
+from django.urls import reverse
+
+
+def get_admin_change_view_url(obj: object) -> str:
+    """returns URL to admin change view for given object"""
+    return reverse(
+        'admin:{}_{}_change'.format(
+            obj._meta.app_label, type(obj).__name__.lower()
+        ),
+        args=(obj.pk,)
+    )
+
+def get_admin_search_url(ModelClass: type) -> str:
+    """returns URL to search URL for model of given object"""
+    return '{}{}/'.format(
+        reverse('admin:app_list', args=(ModelClass._meta.app_label,)),
+        ModelClass.__name__.lower()
+    )

allianceauth/authentication/tests/test_admin.py

@@ -0,0 +1,581 @@
+from urllib.parse import quote
+from unittest.mock import patch
+
+from django.conf import settings
+from django.contrib import admin
+from django.contrib.admin.sites import AdminSite
+from django.contrib.auth.models import User as BaseUser, Group
+from django.test import TestCase, RequestFactory, Client
+
+from allianceauth.authentication.models import (
+    CharacterOwnership, State, OwnershipRecord
+)
+from allianceauth.eveonline.models import (
+    EveCharacter, EveCorporationInfo, EveAllianceInfo
+)
+from allianceauth.tests.auth_utils import AuthUtils
+
+from ..admin import (
+    BaseUserAdmin,
+    CharacterOwnershipAdmin,
+    PermissionAdmin,
+    StateAdmin,
+    MainCorporationsFilter,
+    MainAllianceFilter,
+    OwnershipRecordAdmin,
+    User,
+    UserAdmin,     
+    user_main_organization,
+    user_profile_pic, 
+    user_username,
+    update_main_character_model
+)
+from . import get_admin_change_view_url, get_admin_search_url
+
+if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
+    _has_auto_groups = True
+    from allianceauth.eveonline.autogroups.models import AutogroupsConfig
+else:
+    _has_auto_groups = False
+
+MODULE_PATH = 'allianceauth.authentication.admin'
+
+
+class MockRequest(object):    
+    def __init__(self, user=None):
+        self.user = user
+
+
+def create_test_data():        
+    # groups
+    group_1 = Group.objects.create(
+        name='Group 1'
+    )
+    group_2 = Group.objects.create(
+        name='Group 2'
+    )
+    
+    # user 1 - corp and alliance, normal user
+    character_1 = EveCharacter.objects.create(
+        character_id='1001',
+        character_name='Bruce Wayne',
+        corporation_id='2001',
+        corporation_name='Wayne Technologies',
+        corporation_ticker='WT',
+        alliance_id='3001',
+        alliance_name='Wayne Enterprises',
+        alliance_ticker='WE',
+    )
+    character_1a = EveCharacter.objects.create(
+        character_id='1002',
+        character_name='Batman',
+        corporation_id='2001',
+        corporation_name='Wayne Technologies',
+        corporation_ticker='WT',
+        alliance_id='3001',
+        alliance_name='Wayne Enterprises',
+        alliance_ticker='WE',
+    )
+    alliance = EveAllianceInfo.objects.create(
+        alliance_id='3001',
+        alliance_name='Wayne Enterprises',
+        alliance_ticker='WE',            
+        executor_corp_id='2001'
+    )
+    EveCorporationInfo.objects.create(
+        corporation_id='2001',
+        corporation_name='Wayne Technologies',
+        corporation_ticker='WT',            
+        member_count=42,
+        alliance=alliance
+    )        
+    user_1 = User.objects.create_user(
+        character_1.character_name.replace(' ', '_'),
+        'abc@example.com',
+        'password'
+    )
+    CharacterOwnership.objects.create(
+        character=character_1,
+        owner_hash='x1' + character_1.character_name,
+        user=user_1
+    )
+    CharacterOwnership.objects.create(
+        character=character_1a,
+        owner_hash='x1' + character_1a.character_name,
+        user=user_1
+    )
+    user_1.profile.main_character = character_1
+    user_1.profile.save()
+    user_1.groups.add(group_1)        
+
+    # user 2 - corp only, staff
+    character_2 = EveCharacter.objects.create(
+        character_id=1003,
+        character_name='Clark Kent',
+        corporation_id=2002,
+        corporation_name='Daily Planet',
+        corporation_ticker='DP',
+        alliance_id=None
+    )
+    EveCorporationInfo.objects.create(
+        corporation_id=2002,
+        corporation_name='Daily Plane',
+        corporation_ticker='DP',            
+        member_count=99,
+        alliance=None
+    )
+    user_2 = User.objects.create_user(
+        character_2.character_name.replace(' ', '_'),
+        'abc@example.com',
+        'password'
+    )
+    CharacterOwnership.objects.create(
+        character=character_2,
+        owner_hash='x1' + character_2.character_name,
+        user=user_2
+    )
+    user_2.profile.main_character = character_2
+    user_2.profile.save()
+    user_2.groups.add(group_2)
+    user_2.is_staff = True
+    user_2.save()
+    
+    # user 3 - no main, no group, superuser
+    character_3 = EveCharacter.objects.create(
+        character_id=1101,
+        character_name='Lex Luthor',
+        corporation_id=2101,
+        corporation_name='Lex Corp',
+        corporation_ticker='LC',
+        alliance_id=None
+    )
+    EveCorporationInfo.objects.create(
+        corporation_id=2101,
+        corporation_name='Lex Corp',
+        corporation_ticker='LC',            
+        member_count=666,
+        alliance=None
+    )
+    EveAllianceInfo.objects.create(
+        alliance_id='3101',
+        alliance_name='Lex World Domination',
+        alliance_ticker='LWD',
+        executor_corp_id=''
+    )
+    user_3 = User.objects.create_user(
+        character_3.character_name.replace(' ', '_'),
+        'abc@example.com',
+        'password'
+    )
+    CharacterOwnership.objects.create(
+        character=character_3,
+        owner_hash='x1' + character_3.character_name,
+        user=user_3
+    )
+    user_3.is_superuser = True
+    user_3.save()
+    return user_1, user_2, user_3, group_1, group_2
+
+
+def make_generic_search_request(ModelClass: type, search_term: str):
+    User.objects.create_superuser(
+        username='superuser', password='secret', email='admin@example.com'
+    )
+    c = Client()
+    c.login(username='superuser', password='secret')    
+    return c.get(
+        '%s?q=%s' % (get_admin_search_url(ModelClass), quote(search_term))
+    )    
+
+
+class TestCharacterOwnershipAdmin(TestCase):
+    
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()        
+        cls.user_1, _, _, _, _ = create_test_data()
+    
+    def setUp(self):
+        self.modeladmin = CharacterOwnershipAdmin(
+            model=User, admin_site=AdminSite()
+        )
+
+    def test_change_view_loads_normally(self):        
+        User.objects.create_superuser(
+            username='superuser', password='secret', email='admin@example.com'
+        )
+        c = Client()
+        c.login(username='superuser', password='secret')                
+        ownership = self.user_1.character_ownerships.first()
+        response = c.get(get_admin_change_view_url(ownership))
+        self.assertEqual(response.status_code, 200)
+
+    def test_search_works(self):
+        obj = CharacterOwnership.objects\
+            .filter(user=self.user_1)\
+            .first()
+        response = make_generic_search_request(type(obj), obj.user.username)
+        expected = 200
+        self.assertEqual(response.status_code, expected)
+
+
+class TestOwnershipRecordAdmin(TestCase):
+    
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()        
+        cls.user_1, _, _, _, _ = create_test_data()
+    
+    def setUp(self):
+        self.modeladmin = OwnershipRecordAdmin(
+            model=User, admin_site=AdminSite()
+        )
+
+    def test_change_view_loads_normally(self):        
+        User.objects.create_superuser(
+            username='superuser', password='secret', email='admin@example.com'
+        )
+        c = Client()
+        c.login(username='superuser', password='secret')                
+        ownership_record = OwnershipRecord.objects\
+            .filter(user=self.user_1)\
+            .first()
+        response = c.get(get_admin_change_view_url(ownership_record))
+        self.assertEqual(response.status_code, 200)
+
+    def test_search_works(self):
+        obj = OwnershipRecord.objects.first()
+        response = make_generic_search_request(type(obj), obj.user.username)
+        expected = 200
+        self.assertEqual(response.status_code, expected)
+
+
+class TestStateAdmin(TestCase):
+    
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()        
+        create_test_data()
+    
+    def setUp(self):
+        self.modeladmin = StateAdmin(
+            model=User, admin_site=AdminSite()
+        )
+
+    def test_change_view_loads_normally(self):        
+        User.objects.create_superuser(
+            username='superuser', password='secret', email='admin@example.com'
+        )
+        c = Client()
+        c.login(username='superuser', password='secret')                
+        
+        guest_state = AuthUtils.get_guest_state()
+        response = c.get(get_admin_change_view_url(guest_state))
+        self.assertEqual(response.status_code, 200)
+        
+        member_state = AuthUtils.get_member_state()
+        response = c.get(get_admin_change_view_url(member_state))
+        self.assertEqual(response.status_code, 200)
+
+    def test_search_works(self):
+        obj = State.objects.first()
+        response = make_generic_search_request(type(obj), obj.name)
+        expected = 200
+        self.assertEqual(response.status_code, expected)
+
+class TestUserAdmin(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()        
+        cls.user_1, cls.user_2, cls.user_3, cls.group_1, cls.group_2  = \
+            create_test_data()
+
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.modeladmin = UserAdmin(
+            model=User, admin_site=AdminSite()
+        )
+        self.character_1 = self.user_1.character_ownerships.first().character
+
+    def _create_autogroups(self):
+        """create autogroups for corps and alliances"""
+        if _has_auto_groups:
+            autogroups_config = AutogroupsConfig(
+                corp_groups = True,
+                alliance_groups = True
+            )
+            autogroups_config.save()
+            for state in State.objects.all():
+                autogroups_config.states.add(state)        
+            autogroups_config.update_corp_group_membership(self.user_1)        
+    
+    # column rendering
+
+    def test_user_profile_pic_u1(self):
+        expected = ('<img src="https://images.evetech.net/characters/1001/'
+            'portrait?size=32" class="img-circle">')        
+        self.assertEqual(user_profile_pic(self.user_1), expected)
+
+    def test_user_profile_pic_u3(self):
+        self.assertIsNone(user_profile_pic(self.user_3))
+
+    def test_user_username_u1(self):
+        expected = (
+            '<strong><a href="/admin/authentication/user/{}/change/">'
+            'Bruce_Wayne</a></strong><br>Bruce Wayne'.format(self.user_1.pk)
+        )
+        self.assertEqual(user_username(self.user_1), expected)
+
+    def test_user_username_u3(self):
+        expected = (
+            '<strong><a href="/admin/authentication/user/{}/change/">'
+            'Lex_Luthor</a></strong>'.format(self.user_3.pk)
+        )
+        self.assertEqual(user_username(self.user_3), expected)
+
+    def test_user_main_organization_u1(self):
+        expected = 'Wayne Technologies<br>Wayne Enterprises'
+        self.assertEqual(user_main_organization(self.user_1), expected)
+
+    def test_user_main_organization_u2(self):
+        expected = 'Daily Planet'
+        self.assertEqual(user_main_organization(self.user_2), expected)
+
+    def test_user_main_organization_u3(self):
+        expected = None
+        self.assertEqual(user_main_organization(self.user_3), expected)
+
+    def test_characters_u1(self):
+        expected = 'Batman, Bruce Wayne'
+        result = self.modeladmin._characters(self.user_1)
+        self.assertEqual(result, expected)
+
+    def test_characters_u2(self):
+        expected = 'Clark Kent'
+        result = self.modeladmin._characters(self.user_2)
+        self.assertEqual(result, expected)
+
+    def test_characters_u3(self):
+        expected = 'Lex Luthor'
+        result = self.modeladmin._characters(self.user_3)
+        self.assertEqual(result, expected)
+    
+    def test_groups_u1(self):
+        self._create_autogroups()
+        expected = 'Group 1'
+        result = self.modeladmin._groups(self.user_1)
+        self.assertEqual(result, expected)
+
+    def test_groups_u2(self):
+        self._create_autogroups()
+        expected = 'Group 2'
+        result = self.modeladmin._groups(self.user_2)
+        self.assertEqual(result, expected)
+    
+    def test_groups_u3(self):        
+        self._create_autogroups()
+        result = self.modeladmin._groups(self.user_3)
+        self.assertIsNone(result)
+
+    @patch(MODULE_PATH + '._has_auto_groups', False)
+    def test_groups_u1_no_autogroups(self):        
+        expected = 'Group 1'
+        result = self.modeladmin._groups(self.user_1)
+        self.assertEqual(result, expected)
+
+    @patch(MODULE_PATH + '._has_auto_groups', False)
+    def test_groups_u2_no_autogroups(self):        
+        expected = 'Group 2'
+        result = self.modeladmin._groups(self.user_2)
+        self.assertEqual(result, expected)
+    
+    @patch(MODULE_PATH + '._has_auto_groups', False)
+    def test_groups_u3_no_autogroups(self):                
+        result = self.modeladmin._groups(self.user_3)
+        self.assertIsNone(result)
+
+    def test_state(self):
+        expected = 'Guest'
+        result = self.modeladmin._state(self.user_1)
+        self.assertEqual(result, expected)
+
+    def test_role_u1(self):
+        expected = 'User'
+        result = self.modeladmin._role(self.user_1)
+        self.assertEqual(result, expected)
+
+    def test_role_u2(self):
+        expected = 'Staff'
+        result = self.modeladmin._role(self.user_2)
+        self.assertEqual(result, expected)
+
+    def test_role_u3(self):
+        expected = 'Superuser'
+        result = self.modeladmin._role(self.user_3)
+        self.assertEqual(result, expected)
+
+    def test_list_2_html_w_tooltips_no_cutoff(self):
+        items = ['one', 'two', 'three']
+        expected = 'one, two, three'
+        result = self.modeladmin._list_2_html_w_tooltips(items, 5)
+        self.assertEqual(expected, result)
+
+    def test_list_2_html_w_tooltips_w_cutoff(self):
+        items = ['one', 'two', 'three']
+        expected = ('<span data-tooltip="one, two, three" '
+            'class="tooltip">one, two, (...)</span>')
+        result = self.modeladmin._list_2_html_w_tooltips(items, 2)
+        self.assertEqual(expected, result)
+
+    def test_list_2_html_w_tooltips_empty_list(self):
+        items = []
+        expected = None
+        result = self.modeladmin._list_2_html_w_tooltips(items, 5)
+        self.assertEqual(expected, result)
+    
+    # actions
+
+    @patch(MODULE_PATH + '.UserAdmin.message_user', auto_spec=True)
+    @patch(MODULE_PATH + '.update_character')
+    def test_action_update_main_character_model(
+        self, mock_task, mock_message_user
+    ):
+        users_qs = User.objects.filter(pk__in=[self.user_1.pk, self.user_2.pk])
+        update_main_character_model(
+            self.modeladmin, MockRequest(self.user_1), users_qs
+        )
+        self.assertEqual(mock_task.delay.call_count, 2)
+        self.assertTrue(mock_message_user.called)
+    
+    # filters
+
+    def test_filter_real_groups_with_autogroups(self):
+        
+        class UserAdminTest(BaseUserAdmin): 
+            list_filter = (UserAdmin.RealGroupsFilter,)
+                
+        self._create_autogroups()        
+        my_modeladmin = UserAdminTest(User, AdminSite())
+
+        # Make sure the lookups are correct
+        request = self.factory.get('/')
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        filters = changelist.get_filters(request)
+        filterspec = filters[0][0]
+        expected = [
+            (self.group_1.pk, self.group_1.name), 
+            (self.group_2.pk, self.group_2.name),
+        ]
+        self.assertEqual(filterspec.lookup_choices, expected)
+
+        # Make sure the correct queryset is returned
+        request = self.factory.get('/', {'group_id__exact': self.group_1.pk})
+        request.user = self.user_1                
+        changelist = my_modeladmin.get_changelist_instance(request)
+        queryset = changelist.get_queryset(request)
+        expected = User.objects.filter(groups__in=[self.group_1])
+        self.assertSetEqual(set(queryset), set(expected))
+
+    @patch(MODULE_PATH + '._has_auto_groups', False)
+    def test_filter_real_groups_no_autogroups(self):
+        
+        class UserAdminTest(BaseUserAdmin): 
+            list_filter = (UserAdmin.RealGroupsFilter,)
+                        
+        my_modeladmin = UserAdminTest(User, AdminSite())
+
+        # Make sure the lookups are correct
+        request = self.factory.get('/')
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        filters = changelist.get_filters(request)
+        filterspec = filters[0][0]
+        expected = [
+            (self.group_1.pk, self.group_1.name), 
+            (self.group_2.pk, self.group_2.name),
+        ]
+        self.assertEqual(filterspec.lookup_choices, expected)
+
+        # Make sure the correct queryset is returned
+        request = self.factory.get('/', {'group_id__exact': self.group_1.pk})
+        request.user = self.user_1                
+        changelist = my_modeladmin.get_changelist_instance(request)
+        queryset = changelist.get_queryset(request)
+        expected = User.objects.filter(groups__in=[self.group_1])
+        self.assertSetEqual(set(queryset), set(expected))
+
+    def test_filter_main_corporations(self):
+        
+        class UserAdminTest(BaseUserAdmin): 
+            list_filter = (MainCorporationsFilter,)
+                
+        my_modeladmin = UserAdminTest(User, AdminSite())
+
+        # Make sure the lookups are correct
+        request = self.factory.get('/')
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        filters = changelist.get_filters(request)
+        filterspec = filters[0][0]
+        expected = [            
+            ('2002', 'Daily Planet'),
+            ('2001', 'Wayne Technologies'),
+        ]
+        self.assertEqual(filterspec.lookup_choices, expected)
+
+        # Make sure the correct queryset is returned
+        request = self.factory.get(
+            '/', 
+            {'main_corporation_id__exact': self.character_1.corporation_id}
+        )
+        request.user = self.user_1                
+        changelist = my_modeladmin.get_changelist_instance(request)
+        queryset = changelist.get_queryset(request)
+        expected = [self.user_1]
+        self.assertSetEqual(set(queryset), set(expected))
+
+    def test_filter_main_alliances(self):
+        
+        class UserAdminTest(BaseUserAdmin): 
+            list_filter = (MainAllianceFilter,)
+                
+        my_modeladmin = UserAdminTest(User, AdminSite())
+
+        # Make sure the lookups are correct
+        request = self.factory.get('/')
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        filters = changelist.get_filters(request)
+        filterspec = filters[0][0]
+        expected = [            
+            ('3001', 'Wayne Enterprises'),            
+        ]
+        self.assertEqual(filterspec.lookup_choices, expected)
+
+        # Make sure the correct queryset is returned
+        request = self.factory.get(
+            '/', 
+            {'main_alliance_id__exact': self.character_1.alliance_id}
+        )
+        request.user = self.user_1                
+        changelist = my_modeladmin.get_changelist_instance(request)
+        queryset = changelist.get_queryset(request)
+        expected = [self.user_1]
+        self.assertSetEqual(set(queryset), set(expected))
+
+    def test_change_view_loads_normally(self):
+        User.objects.create_superuser(
+            username='superuser', password='secret', email='admin@example.com'
+        )
+        c = Client()
+        c.login(username='superuser', password='secret')                
+        response = c.get(get_admin_change_view_url(self.user_1))
+        self.assertEqual(response.status_code, 200)
+
+    def test_search_works(self):
+        obj = User.objects.first()
+        response = make_generic_search_request(type(obj), obj.username)
+        expected = 200
+        self.assertEqual(response.status_code, expected)

allianceauth/authentication/tests/test_all.py

@@ -1,23 +1,28 @@
 from unittest import mock
 from io import StringIO
-from django.test import TestCase
-from django.contrib.auth.models import User
-from allianceauth.tests.auth_utils import AuthUtils
-from .models import CharacterOwnership, UserProfile, State, get_guest_state, OwnershipRecord
-from .backends import StateBackend
-from .tasks import check_character_ownership
-from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo, EveAllianceInfo
-from esi.models import Token
-from esi.errors import IncompleteResponseError
-from allianceauth.authentication.decorators import main_character_required
-from django.test.client import RequestFactory
-from django.http.response import HttpResponse
-from django.contrib.auth.models import AnonymousUser
-from django.conf import settings
-from django.shortcuts import reverse
-from django.core.management import call_command
 from urllib import parse
 
+from django.conf import settings
+from django.contrib.auth.models import AnonymousUser, User
+from django.core.management import call_command
+from django.http.response import HttpResponse
+from django.shortcuts import reverse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+
+from allianceauth.authentication.decorators import main_character_required
+from allianceauth.eveonline.models import EveCharacter, EveCorporationInfo,\
+    EveAllianceInfo
+from allianceauth.tests.auth_utils import AuthUtils
+from esi.errors import IncompleteResponseError
+from esi.models import Token
+
+from ..backends import StateBackend
+from ..models import CharacterOwnership, UserProfile, State, get_guest_state,\
+    OwnershipRecord
+from ..tasks import check_character_ownership
+
 MODULE_PATH = 'allianceauth.authentication'
 
 

allianceauth/authentication/tests/test_app_settings.py

@@ -0,0 +1,102 @@
+from unittest.mock import Mock, patch
+from django.test import TestCase
+
+from .. import app_settings
+
+MODULE_PATH = 'allianceauth.authentication'
+
+
+class TestSetAppSetting(TestCase):
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_default_if_not_set(self, mock_settings):        
+        mock_settings.TEST_SETTING_DUMMY = Mock(spec=None)
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            False,             
+        )
+        self.assertEqual(result, False)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_default_if_not_set_for_none(self, mock_settings):        
+        mock_settings.TEST_SETTING_DUMMY = Mock(spec=None)
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            None,
+            required_type=int
+        )
+        self.assertEqual(result, None)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_true_stays_true(self, mock_settings):
+        mock_settings.TEST_SETTING_DUMMY = True
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            False,         
+        )
+        self.assertEqual(result, True)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_false_stays_false(self, mock_settings):
+        mock_settings.TEST_SETTING_DUMMY = False
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            False
+        )
+        self.assertEqual(result, False)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_default_for_invalid_type_bool(self, mock_settings):
+        mock_settings.TEST_SETTING_DUMMY = 'invalid type'
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            False
+        )
+        self.assertEqual(result, False)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_default_for_invalid_type_int(self, mock_settings):
+        mock_settings.TEST_SETTING_DUMMY = 'invalid type'
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            50
+        )
+        self.assertEqual(result, 50)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_default_if_below_minimum_1(self, mock_settings):
+        mock_settings.TEST_SETTING_DUMMY = -5
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            default_value=50
+        )
+        self.assertEqual(result, 50)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_default_if_below_minimum_2(self, mock_settings):
+        mock_settings.TEST_SETTING_DUMMY = -50
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            default_value=50,
+            min_value=-10
+        )
+        self.assertEqual(result, 50)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_default_for_invalid_type_int(self, mock_settings):
+        mock_settings.TEST_SETTING_DUMMY = 1000
+        result = app_settings._clean_setting(
+            'TEST_SETTING_DUMMY',             
+            default_value=50,
+            max_value=100
+        )
+        self.assertEqual(result, 50)
+
+    @patch(MODULE_PATH + '.app_settings.settings')
+    def test_default_is_none_needs_required_type(self, mock_settings):
+        mock_settings.TEST_SETTING_DUMMY = 'invalid type'
+        with self.assertRaises(ValueError):
+            result = app_settings._clean_setting(
+                'TEST_SETTING_DUMMY',             
+                default_value=None
+            )

allianceauth/authentication/urls.py

@@ -7,11 +7,28 @@ from . import views
 app_name = 'authentication'
 
 urlpatterns = [
-    url(r'^$', login_required(TemplateView.as_view(template_name='authentication/dashboard.html')),),
-    url(r'^account/login/$', TemplateView.as_view(template_name='public/login.html'), name='login'),
-    url(r'^account/characters/main/$', views.main_character_change, name='change_main_character'),
-    url(r'^account/characters/add/$', views.add_character, name='add_character'),
-    url(r'^help/$', login_required(TemplateView.as_view(template_name='allianceauth/help.html')), name='help'),
-    url(r'^dashboard/$',
-        login_required(TemplateView.as_view(template_name='authentication/dashboard.html')), name='dashboard'),
+    url(r'^$', views.index, name='index'),
+    url(
+        r'^account/login/$', 
+        TemplateView.as_view(template_name='public/login.html'), 
+        name='login'
+    ),
+    url(
+        r'^account/characters/main/$',
+        views.main_character_change,
+        name='change_main_character'
+    ),
+    url(
+        r'^account/characters/add/$', 
+        views.add_character, 
+        name='add_character'
+    ),
+    url(
+        r'^help/$', 
+        login_required(
+            TemplateView.as_view(template_name='allianceauth/help.html')
+        ),
+        name='help'
+    ),
+    url(r'^dashboard/$', views.dashboard, name='dashboard'),
 ]

allianceauth/authentication/views.py

@@ -7,20 +7,58 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.core import signing
 from django.urls import reverse
-from django.shortcuts import redirect
-from django.utils.translation import ugettext_lazy as _
+from django.shortcuts import redirect, render
+from django.utils.translation import gettext_lazy as _
+
+from allianceauth.eveonline.models import EveCharacter
 from esi.decorators import token_required
 from esi.models import Token
-from registration.backends.hmac.views import RegistrationView as BaseRegistrationView, \
-    ActivationView as BaseActivationView, REGISTRATION_SALT
+
+from registration.backends.hmac.views import (
+    RegistrationView as BaseRegistrationView, 
+    ActivationView as BaseActivationView, 
+    REGISTRATION_SALT
+)
 from registration.signals import user_registered
 
 from .models import CharacterOwnership
 from .forms import RegistrationForm
 
+if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
+    _has_auto_groups = True
+    from allianceauth.eveonline.autogroups.models import *
+else:
+    _has_auto_groups = False
+
+
 logger = logging.getLogger(__name__)
 
 
+@login_required
+def index(request):
+    return redirect('authentication:dashboard')
+
+
+@login_required
+def dashboard(request):
+    groups = request.user.groups.all()
+    if _has_auto_groups:
+        groups = groups\
+            .filter(managedalliancegroup__isnull=True)\
+            .filter(managedcorpgroup__isnull=True)
+    groups = groups.order_by('name')
+    characters = EveCharacter.objects\
+        .filter(character_ownership__user=request.user)\
+        .select_related()\
+        .order_by('character_name')
+        
+    context = {
+        'groups': groups,
+        'characters': characters
+    }
+    return render(request, 'authentication/dashboard.html', context)
+
+
 @login_required
 @token_required(scopes=settings.LOGIN_TOKEN_SCOPES)
 def main_character_change(request, token):
@@ -31,7 +69,10 @@ def main_character_change(request, token):
         if not CharacterOwnership.objects.filter(character__character_id=token.character_id).exists():
             co = CharacterOwnership.objects.create_by_token(token)
         else:
-            messages.error(request, 'Cannot change main character to %(char)s: character owned by a different account.' % ({'char': token.character_name}))
+            messages.error(
+                request, 
+                _('Cannot change main character to %(char)s: character owned by a different account.') % ({'char': token.character_name})
+            )
             co = None
     if co:
         request.user.profile.main_character = co.character

allianceauth/corputils/templates/corputils/corpstats.html

@@ -7,11 +7,12 @@
             <div class="col-lg-12 text-center">
                 <table class="table">
                     <tr>
-                        <td class="text-center col-lg-6
-                                {% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}"><img
-                                class="ra-avatar" src="{{ corpstats.corp.logo_url_128 }}"></td>
+                        <td class="text-center col-lg-6{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}">
+                                <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}">
+                            </td>
                         {% if corpstats.corp.alliance %}
-                            <td class="text-center col-lg-6"><img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_128 }}">
+                            <td class="text-center col-lg-6">
+                                <img class="ra-avatar" src="{{ corpstats.corp.alliance.logo_url_64 }}">
                             </td>
                         {% endif %}
                     </tr>
@@ -33,11 +34,11 @@
                             <li><a href="#members" data-toggle="pill">{% trans 'Members' %} ({{ corpstats.member_count }})</a></li>
                             <li><a href="#unregistered" data-toggle="pill">{% trans 'Unregistered' %} ({{ unregistered.count }})</a></li>
                         </ul>
-                        <div class="pull-right">
-                            {% trans "Last update:" %} {{ corpstats.last_update|naturaltime }}
-                                <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
-                                    <span class="glyphicon glyphicon-refresh"></span>
-                                </a>
+                        <div class="pull-right hidden-xs">
+                            {% trans "Last update:" %} {{ corpstats.last_update|naturaltime }}&nbsp;
+                            <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
+                                <span class="glyphicon glyphicon-refresh"></span>
+                            </a>
                         </div>
                         <div class="clearfix"></div>
                     </div>

allianceauth/corputils/views.py

@@ -108,10 +108,11 @@ def corpstats_view(request, corp_id=None):
             try:
                 main = char.character_ownership.user.profile.main_character
                 if main is not None:
-                    if main.character_id not in mains:
-                        mains[main.character_id] = {'main':main, 'alts':[]}
+                    if main.corporation_id == corpstats.corp.corporation_id:
+                        if main.character_id not in mains:
+                            mains[main.character_id] = {'main':main, 'alts':[]}
 
-                    mains[main.character_id]['alts'].append(char)
+                        mains[main.character_id]['alts'].append(char)
 
                     if char.corporation_id == corpstats.corp.corporation_id:
                         members.append(char)

allianceauth/eveonline/providers.py

@@ -1,9 +1,16 @@
-from esi.clients import esi_client_factory
-from bravado.exception import HTTPNotFound, HTTPUnprocessableEntity
 import logging
 import os
 
-SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
+from bravado.exception import HTTPNotFound, HTTPUnprocessableEntity, HTTPError
+from jsonschema.exceptions import RefResolutionError
+
+from django.conf import settings
+from esi.clients import esi_client_factory
+
+
+SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(
+    os.path.abspath(__file__)), 'swagger.json'
+)
 """
 Swagger spec operations:
 
@@ -150,10 +157,35 @@ class EveProvider(object):
 
 
 class EveSwaggerProvider(EveProvider):
-    def __init__(self, token=None, adapter=None):
-        self.client = esi_client_factory(token=token, spec_file=SWAGGER_SPEC_PATH)
+    def __init__(self, token=None, adapter=None):        
+        if settings.DEBUG:
+            self._client = None
+            logger.info(
+                'DEBUG mode detected: ESI client will be loaded on-demand.'
+            )
+        else:
+            try:
+                self._client = esi_client_factory(
+                    token=token, spec_file=SWAGGER_SPEC_PATH
+                )
+            except (HTTPError, RefResolutionError):
+                logger.exception(
+                    'Failed to load ESI client on startup. '
+                    'Switching to on-demand loading for ESI client.'
+                )
+                self._client = None
+
+        self._token = token
         self.adapter = adapter or self
 
+    @property
+    def client(self):
+        if self._client is None:
+            self._client = esi_client_factory(
+                token=self._token, spec_file=SWAGGER_SPEC_PATH
+            )
+        return self._client
+
     def __str__(self):
         return 'esi'
 

allianceauth/eveonline/tasks.py

@@ -7,6 +7,7 @@ from .models import EveCorporationInfo
 
 logger = logging.getLogger(__name__)
 
+TASK_PRIORITY = 7
 
 @shared_task
 def update_corp(corp_id):
@@ -27,11 +28,12 @@ def update_character(character_id):
 def run_model_update():
     # update existing corp models
     for corp in EveCorporationInfo.objects.all().values('corporation_id'):
-        update_corp.delay(corp['corporation_id'])
+        update_corp.apply_async(args=[corp['corporation_id']], priority=TASK_PRIORITY)
 
     # update existing alliance models
     for alliance in EveAllianceInfo.objects.all().values('alliance_id'):
-        update_alliance.delay(alliance['alliance_id'])
+        update_alliance.apply_async(args=[alliance['alliance_id']], priority=TASK_PRIORITY)
 
+    #update existing character models
     for character in EveCharacter.objects.all().values('character_id'):
-        update_character.delay(character['character_id'])
+        update_character.apply_async(args=[character['character_id']], priority=TASK_PRIORITY)

allianceauth/eveonline/tests/__init__.py

@@ -0,0 +1,29 @@
+import logging
+import os
+    
+
+def set_logger(logger_name: str, name: str) -> object:
+    """set logger for current test module
+    
+    Args:
+    - logger: current logger object
+    - name: name of current module, e.g. __file__
+    
+    Returns:
+    - amended logger
+    """
+    
+    # reconfigure logger so we get logging from tested module
+    f_format = logging.Formatter(
+        '%(asctime)s - %(levelname)s - %(module)s:%(funcName)s - %(message)s'
+    )
+    f_handler = logging.FileHandler(
+        '{}.log'.format(os.path.splitext(name)[0]),
+        'w+'
+    )
+    f_handler.setFormatter(f_format)
+    logger = logging.getLogger(logger_name)
+    logger.level = logging.DEBUG
+    logger.addHandler(f_handler)
+    logger.propagate = False
+    return logger

allianceauth/eveonline/tests/test_providers.py

@@ -1,13 +1,24 @@
+import os
 from unittest.mock import Mock, patch
 
 from bravado.exception import HTTPNotFound, HTTPUnprocessableEntity
+from jsonschema.exceptions import RefResolutionError
+
 from django.test import TestCase
 
+from . import set_logger
 from ..models import EveCharacter, EveCorporationInfo, EveAllianceInfo
 from ..providers import ObjectNotFound, Entity, Character, Corporation, \
     Alliance, ItemType, EveProvider, EveSwaggerProvider
 
 
+MODULE_PATH = 'allianceauth.eveonline.providers'
+SWAGGER_OLD_SPEC_PATH = os.path.join(os.path.dirname(
+        os.path.abspath(__file__)), 'swagger_old.json'
+    )
+set_logger(MODULE_PATH, __file__)
+
+
 class TestObjectNotFound(TestCase):
 
     def test_str(self):
@@ -65,7 +76,7 @@ class TestEntity(TestCase):
 
 class TestCorporation(TestCase):
 
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_alliance')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_alliance')
     def test_alliance_defined(self, mock_provider_get_alliance):
         my_alliance = Alliance(
             id=3001,
@@ -89,7 +100,7 @@ class TestCorporation(TestCase):
         self.assertEqual(mock_provider_get_alliance.call_count, 1)
 
 
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_alliance')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_alliance')
     def test_alliance_not_defined(self, mock_provider_get_alliance):        
         mock_provider_get_alliance.return_value = None
         
@@ -100,7 +111,7 @@ class TestCorporation(TestCase):
         )
         
 
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_character')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_character')
     def test_ceo(self, mock_provider_get_character):        
         my_ceo = Character(
             id=1001,
@@ -162,7 +173,7 @@ class TestAlliance(TestCase):
         if corp_id:                
             return corps[int(corp_id)]
 
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_corp')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_corp')
     def test_corp(self, mock_provider_get_corp):                
         mock_provider_get_corp.side_effect = TestAlliance._get_corp
         
@@ -190,7 +201,7 @@ class TestAlliance(TestCase):
         self.assertEqual(mock_provider_get_corp.call_count, 2)
 
 
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_corp')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_corp')
     def test_corps(self, mock_provider_get_corp):
         mock_provider_get_corp.side_effect = TestAlliance._get_corp
 
@@ -203,7 +214,7 @@ class TestAlliance(TestCase):
             ]
         )
 
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_corp')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_corp')
     def test_executor_corp(self, mock_provider_get_corp):
         mock_provider_get_corp.side_effect = TestAlliance._get_corp
         
@@ -229,7 +240,7 @@ class TestCharacter(TestCase):
             alliance_id=3001
         )
 
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_corp')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_corp')
     def test_corp(self, mock_provider_get_corp):
         my_corp = Corporation(
             id=2001,
@@ -244,8 +255,8 @@ class TestCharacter(TestCase):
         self.assertEqual(mock_provider_get_corp.call_count, 1)
 
     
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_alliance')
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_corp')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_alliance')
+    @patch(MODULE_PATH + '.EveSwaggerProvider.get_corp')
     def test_alliance_has_one(
         self, 
         mock_provider_get_corp,
@@ -311,7 +322,6 @@ class TestEveProvider(TestCase):
 
 
 class TestEveSwaggerProvider(TestCase):
-
     
     @staticmethod
     def esi_get_alliances_alliance_id(alliance_id):
@@ -437,13 +447,13 @@ class TestEveSwaggerProvider(TestCase):
             raise HTTPNotFound(Mock())
 
 
-    @patch('allianceauth.eveonline.providers.esi_client_factory')
+    @patch(MODULE_PATH + '.esi_client_factory')
     def test_str(self, mock_esi_client_factory):        
         my_provider = EveSwaggerProvider()
         self.assertEqual(str(my_provider), 'esi')
 
 
-    @patch('allianceauth.eveonline.providers.esi_client_factory')
+    @patch(MODULE_PATH + '.esi_client_factory')
     def test_get_alliance(self, mock_esi_client_factory):
         mock_esi_client_factory.return_value\
             .Alliance.get_alliances_alliance_id \
@@ -472,7 +482,7 @@ class TestEveSwaggerProvider(TestCase):
             my_provider.get_alliance(3999)
 
 
-    @patch('allianceauth.eveonline.providers.esi_client_factory')
+    @patch(MODULE_PATH + '.esi_client_factory')
     def test_get_corp(self, mock_esi_client_factory):
         mock_esi_client_factory.return_value\
             .Corporation.get_corporations_corporation_id \
@@ -499,7 +509,7 @@ class TestEveSwaggerProvider(TestCase):
             my_provider.get_corp(2999)
         
 
-    @patch('allianceauth.eveonline.providers.esi_client_factory')
+    @patch(MODULE_PATH + '.esi_client_factory')
     def test_get_character(self, mock_esi_client_factory):
         mock_esi_client_factory.return_value\
             .Character.get_characters_character_id \
@@ -527,7 +537,7 @@ class TestEveSwaggerProvider(TestCase):
             my_provider.get_character(1999)
 
 
-    @patch('allianceauth.eveonline.providers.esi_client_factory')
+    @patch(MODULE_PATH + '.esi_client_factory')
     def test_get_itemtype(self, mock_esi_client_factory):
         mock_esi_client_factory.return_value\
             .Universe.get_universe_types_type_id \
@@ -542,4 +552,54 @@ class TestEveSwaggerProvider(TestCase):
         
         # type not found
         with self.assertRaises(ObjectNotFound):
-            my_provider.get_itemtype(4999)
+            my_provider.get_itemtype(4999)
+
+    @patch(MODULE_PATH + '.settings.DEBUG', False)
+    @patch(MODULE_PATH + '.esi_client_factory')
+    def test_create_client_on_normal_startup(self, mock_esi_client_factory):
+        my_provider = EveSwaggerProvider()
+        self.assertTrue(mock_esi_client_factory.called)
+        self.assertIsNotNone(my_provider._client)
+    
+    @patch(MODULE_PATH + '.SWAGGER_SPEC_PATH', SWAGGER_OLD_SPEC_PATH)
+    @patch(MODULE_PATH + '.settings.DEBUG', False)
+    @patch('socket.socket')
+    def test_create_client_on_normal_startup_w_old_swagger_spec(
+        self, mock_socket
+    ):
+        mock_socket.side_effect = Exception('Network blocked for testing')
+        my_provider = EveSwaggerProvider()        
+        self.assertIsNone(my_provider._client)    
+
+    @patch(MODULE_PATH + '.settings.DEBUG', True)
+    @patch(MODULE_PATH + '.esi_client_factory')
+    def test_dont_create_client_on_debug_startup(self, mock_esi_client_factory):
+        my_provider = EveSwaggerProvider()
+        self.assertFalse(mock_esi_client_factory.called)
+        self.assertIsNone(my_provider._client)
+
+    @patch(MODULE_PATH + '.settings.DEBUG', False)
+    @patch(MODULE_PATH + '.esi_client_factory')
+    def test_dont_create_client_if_client_creation_fails_on_normal_startup(
+        self, mock_esi_client_factory
+    ):
+        mock_esi_client_factory.side_effect = RefResolutionError(cause='Test')
+        my_provider = EveSwaggerProvider()
+        self.assertTrue(mock_esi_client_factory.called)
+        self.assertIsNone(my_provider._client)
+
+    @patch(MODULE_PATH + '.settings.DEBUG', True)
+    @patch(MODULE_PATH + '.esi_client_factory')
+    def test_client_loads_on_demand(
+        self, mock_esi_client_factory
+    ):
+        mock_esi_client_factory.return_value = 'my_client'
+        my_provider = EveSwaggerProvider()
+        self.assertFalse(mock_esi_client_factory.called)
+        self.assertIsNone(my_provider._client)
+        my_client = my_provider.client
+        self.assertTrue(mock_esi_client_factory.called)
+        self.assertIsNotNone(my_provider._client)
+        self.assertEqual(my_client, 'my_client')
+        
+

allianceauth/eveonline/tests/test_tasks.py

@@ -80,28 +80,28 @@ class TestTasks(TestCase):
             character_name='character.name',
             corporation_id='character.corp.id',
             corporation_name='character.corp.name',
-            corporation_ticker='character.corp.ticker',
+            corporation_ticker='c.c.t',  # max 5 chars 
             alliance_id='character.alliance.id',
             alliance_name='character.alliance.name',
         )
 
         run_model_update()
 
-        self.assertEqual(mock_update_corp.delay.call_count, 1)
+        self.assertEqual(mock_update_corp.apply_async.call_count, 1)
         self.assertEqual(
-            int(mock_update_corp.delay.call_args[0][0]), 
+            int(mock_update_corp.apply_async.call_args[1]['args'][0]), 
             2345
         )
         
-        self.assertEqual(mock_update_alliance.delay.call_count, 1)
+        self.assertEqual(mock_update_alliance.apply_async.call_count, 1)
         self.assertEqual(
-            int(mock_update_alliance.delay.call_args[0][0]), 
+            int(mock_update_alliance.apply_async.call_args[1]['args'][0]), 
             3456
         )
         
-        self.assertEqual(mock_update_character.delay.call_count, 1)
+        self.assertEqual(mock_update_character.apply_async.call_count, 1)
         self.assertEqual(
-            int(mock_update_character.delay.call_args[0][0]), 
+            int(mock_update_character.apply_async.call_args[1]['args'][0]), 
             1234
         )
 

allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html

@@ -15,7 +15,13 @@
             </div>
             {% endif %}
         </h1>
-        <h2>{% blocktrans %}{{ user }} has collected {{ n_fats }} link{{ n_fats|pluralize }} this month.{% endblocktrans %}</h2>
+        <h2>
+            {% blocktrans count links=n_fats trimmed %}
+                {{ user }} has collected one link this month.
+            {% plural %}
+                {{ user }} has collected {{ links }} links this month.
+            {% endblocktrans %}
+        </h2>
         <table class="table table-responsive">
             <tr>
                 <th class="col-md-2 text-center">{% trans "Ship" %}</th>
@@ -29,7 +35,13 @@
             {% endfor %}
         </table>
         {%  if created_fats %}
-         <h2>{% blocktrans %}{{ user }} has created {{ n_created_fats }} link{{ n_created_fats|pluralize }} this month.{% endblocktrans %}</h2>
+        <h2>
+            {% blocktrans count links=n_created_fats trimmed  %}
+                {{ user }} has created one link this month.
+            {% plural %}
+                {{ user }} has created {{ links }} links this month.
+            {% endblocktrans %}
+        </h2>
         {% if created_fats %}
         <table class="table">
             <tr>

allianceauth/groupmanagement/admin.py

@@ -1,18 +1,46 @@
+from django.conf import settings
+
 from django.contrib import admin
-from django.contrib.auth.models import Group as BaseGroup
-from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed
+from django.contrib.auth.models import Group as BaseGroup, User
+from django.db.models import Count
+from django.db.models.functions import Lower
+from django.db.models.signals import pre_save, post_save, pre_delete, \
+    post_delete, m2m_changed
 from django.dispatch import receiver
+
 from .models import AuthGroup
 from .models import GroupRequest
 from . import signals
 
+if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
+    _has_auto_groups = True    
+else:
+    _has_auto_groups = False
+
+
 class AuthGroupInlineAdmin(admin.StackedInline):
     model = AuthGroup
     filter_horizontal = ('group_leaders', 'group_leader_groups', 'states',)
-    fields = ('description', 'group_leaders', 'group_leader_groups', 'states', 'internal', 'hidden', 'open', 'public')
+    fields = (
+        'description', 
+        'group_leaders', 
+        'group_leader_groups', 
+        'states', 'internal', 
+        'hidden', 
+        'open', 
+        'public'
+    )
     verbose_name_plural = 'Auth Settings'
     verbose_name = ''
 
+    def formfield_for_manytomany(self, db_field, request, **kwargs):
+        """overriding this formfield to have sorted lists in the form"""
+        if db_field.name == "group_leaders":
+            kwargs["queryset"] = User.objects.order_by(Lower('username'))
+        elif db_field.name == "group_leader_groups":
+            kwargs["queryset"] = Group.objects.order_by(Lower('name'))
+        return super().formfield_for_manytomany(db_field, request, **kwargs)
+
     def has_add_permission(self, request):
         return False
 
@@ -23,7 +51,118 @@ class AuthGroupInlineAdmin(admin.StackedInline):
         return request.user.has_perm('auth.change_group')
 
 
-class GroupAdmin(admin.ModelAdmin):
+if _has_auto_groups:
+    class IsAutoGroupFilter(admin.SimpleListFilter):
+        title = 'auto group'
+        parameter_name = 'is_auto_group__exact'
+
+        def lookups(self, request, model_admin):
+            return (
+                ('yes', 'Yes'),
+                ('no', 'No'),
+            )
+
+        def queryset(self, request, queryset):
+            value = self.value()
+            if value == 'yes':
+                return queryset.exclude(
+                    managedalliancegroup__isnull=True, 
+                    managedcorpgroup__isnull=True
+                )
+            elif value == 'no':
+                return queryset.filter(
+                    managedalliancegroup__isnull=True, 
+                    managedcorpgroup__isnull=True
+                )
+            else:
+                return queryset
+
+
+class HasLeaderFilter(admin.SimpleListFilter):
+    title = 'has leader'
+    parameter_name = 'has_leader__exact'
+
+    def lookups(self, request, model_admin):
+        return (
+            ('yes', 'Yes'),
+            ('no', 'No'),
+        )
+
+    def queryset(self, request, queryset):
+        value = self.value()
+        if value == 'yes':
+            return queryset.filter(authgroup__group_leaders__isnull=False)
+        elif value == 'no':
+            return queryset.filter(authgroup__group_leaders__isnull=True)
+        else:
+            return queryset
+
+class GroupAdmin(admin.ModelAdmin):    
+    list_select_related = True
+    ordering = ('name', )
+    list_display = (
+        'name', 
+        '_description', 
+        '_properties', 
+        '_member_count', 
+        'has_leader'
+    )
+    list_filter = [
+        'authgroup__internal', 
+        'authgroup__hidden', 
+        'authgroup__open', 
+        'authgroup__public',        
+    ]
+    if _has_auto_groups:
+        list_filter.append(IsAutoGroupFilter)
+    list_filter.append(HasLeaderFilter)
+
+    search_fields = ('name', 'authgroup__description')
+    
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)                
+        qs = qs.annotate(
+            member_count=Count('user', distinct=True),
+        )        
+        return qs
+
+    def _description(self, obj):
+        return obj.authgroup.description
+
+    def _member_count(self, obj):
+        return obj.member_count
+
+    _member_count.short_description = 'Members'
+    _member_count.admin_order_field = 'member_count'
+    
+    def has_leader(self, obj):
+        return obj.authgroup.group_leaders.exists()
+    
+    has_leader.boolean = True    
+
+    def _properties(self, obj):
+        properties = list()       
+        if _has_auto_groups and (
+            obj.managedalliancegroup_set.exists() 
+            or obj.managedcorpgroup_set.exists()
+        ):
+            properties.append('Auto Group')
+        elif obj.authgroup.internal:
+            properties.append('Internal')
+        else:
+            if obj.authgroup.hidden:
+                properties.append('Hidden')
+            if obj.authgroup.open:
+                properties.append('Open')
+            if obj.authgroup.public:
+                properties.append('Public')
+        if not properties:
+            properties.append('Default')
+                    
+        return properties
+
+    _properties.short_description = "properties"
+
     filter_horizontal = ('permissions',)
     inlines = (AuthGroupInlineAdmin,)
 

allianceauth/groupmanagement/managers.py

@@ -1,27 +1,53 @@
-from django.contrib.auth.models import Group
-from django.db.models import Q
+import logging
+
+from django.contrib.auth.models import Group, User
+from django.db.models import Q, QuerySet
+
+from allianceauth.authentication.models import State
+
+
+logger = logging.getLogger(__name__)
 
 
 class GroupManager:
-    def __init__(self):
-        pass
+    
+    @classmethod
+    def get_joinable_groups_for_user(
+        cls, user: User, include_hidden = True
+    ) -> QuerySet:
+        """get groups a user could join incl. groups already joined"""
+        groups_qs = cls.get_joinable_groups(user.profile.state)
+
+        if not user.has_perm('groupmanagement.request_groups'):
+            groups_qs = groups_qs.filter(authgroup__public=True)
+        
+        if not include_hidden:
+            groups_qs = groups_qs.filter(authgroup__hidden=False)
+
+        return groups_qs
 
     @staticmethod
-    def get_joinable_groups(state):
-        return Group.objects.select_related('authgroup').exclude(authgroup__internal=True)\
+    def get_joinable_groups(state: State) -> QuerySet:
+        """get groups that can be joined by user with given state"""
+        return Group.objects\
+            .select_related('authgroup')\
+            .exclude(authgroup__internal=True)\
             .filter(Q(authgroup__states=state) | Q(authgroup__states=None))
 
     @staticmethod
-    def get_all_non_internal_groups():
-        return Group.objects.select_related('authgroup').exclude(authgroup__internal=True)
+    def get_all_non_internal_groups() -> QuerySet:
+        """get groups that are not internal"""
+        return Group.objects\
+            .select_related('authgroup')\
+            .exclude(authgroup__internal=True)
 
     @staticmethod
-    def get_group_leaders_groups(user):
+    def get_group_leaders_groups(user: User):
         return Group.objects.select_related('authgroup').filter(authgroup__group_leaders__in=[user]) | \
                Group.objects.select_related('authgroup').filter(authgroup__group_leader_groups__in=user.groups.all())
 
     @staticmethod
-    def joinable_group(group, state):
+    def joinable_group(group: Group, state: State) -> bool:
         """
         Check if a group is a user/state joinable group, i.e.
         not an internal group for Corp, Alliance, Members etc,
@@ -30,12 +56,15 @@ class GroupManager:
         :param state: allianceauth.authentication.State object
         :return: bool True if its joinable, False otherwise
         """
-        if len(group.authgroup.states.all()) != 0 and state not in group.authgroup.states.all():
+        if (len(group.authgroup.states.all()) != 0 
+            and state not in group.authgroup.states.all()
+        ):
             return False
-        return not group.authgroup.internal
+        else:
+            return not group.authgroup.internal
 
     @staticmethod
-    def check_internal_group(group):
+    def check_internal_group(group: Group) -> bool:
         """
         Check if a group is auditable, i.e not an internal group
         :param group: django.contrib.auth.models.Group object
@@ -44,20 +73,11 @@ class GroupManager:
         return not group.authgroup.internal
 
     @staticmethod
-    def check_internal_group(group):
-        """
-        Check if a group is auditable, i.e not an internal group
-        :param group: django.contrib.auth.models.Group object
-        :return: bool True if it is auditable, false otherwise
-        """
-        return not group.authgroup.internal
-
-    @staticmethod
-    def has_management_permission(user):
+    def has_management_permission(user: User) -> bool:
         return user.has_perm('auth.group_management')
 
     @classmethod
-    def can_manage_groups(cls, user):
+    def can_manage_groups(cls, user:User ) -> bool:
         """
         For use with user_passes_test decorator.
         Check if the user can manage groups. Either has the
@@ -71,7 +91,7 @@ class GroupManager:
         return False
 
     @classmethod
-    def can_manage_group(cls, user, group):
+    def can_manage_group(cls, user: User, group: Group) -> bool:
         """
         Check user has permission to manage the given group
         :param user: User object to test permission of
@@ -79,5 +99,5 @@ class GroupManager:
         :return: True if the user can manage the group
         """
         if user.is_authenticated:
-            return cls.has_management_permission(user) or user.leads_groups.filter(group=group).exists()
+            return cls.has_management_permission(user) or cls.get_group_leaders_groups(user).filter(pk=group.pk).exists()
         return False

allianceauth/groupmanagement/templates/groupmanagement/audit.html

@@ -13,54 +13,95 @@
                 {{ group }} - {% trans 'Audit Log' %}
             </div>
             <div class="panel-body">            
-                <p> All times displayed are EVE/UTC.</p>
+                <p> 
+                    <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
+                        {% trans "Back" %}
+                    </a>
+                </p>              
                 {% if entries %}
                     <div class="table-responsive">
                         <table class="table table-striped" id="log-entries">
                             <thead>
                                 <th class="text-center" scope="col">{% trans "Date/Time" %}</th>
                                 <th class="text-center" scope="col">{% trans "Requestor" %}</th>
-                                <th class="text-center" scope="col">{% trans "Main Character" %}</th>
-                                <th class="text-center" scope="col">{% trans "Group" %}</th>
+                                <th class="text-center" scope="col">{% trans "Character" %}</th>
+                                <th class="text-center" scope="col">{% trans "Corporation" %}</th>
                                 <th class="text-center" scope="col">{% trans "Type" %}</th>
                                 <th class="text-center" scope="col">{% trans "Action" %}</th>
                                 <th class="text-center" scope="col">{% trans "Actor" %}</th>
                             </thead>
                             <tbody>
-                            {% for entry in entries %}
-                                <tr>
-                                    <td class="text-center">{{ entry.date }}</td>
-                                    <td class="text-center">{{ entry.requestor }}</td>
-                                    <td class="text-center">{{ entry.req_char }}</td>
-                                    <td class="text-center">{{ entry.group }}</td>
-                                    <td class="text-center">{{ entry.type_to_str }}</td>
-                                    {% if entry.request_type is None %}
-                                        <td class="text-center"> Removed</td>
-                                    {% else %}
-                                        <td class="text-center">{{ entry.action_to_str }}</td>
-                                    {% endif %}
-                                    <td class="text-center">{{ entry.request_actor }}</td>
-                                </tr>
-                            {% endfor %}
+                                {% for entry in entries %}
+                                    <tr>
+                                        <td class="text-center">{{ entry.date }}</td>
+                                        <td class="text-center">{{ entry.requestor }}</td>
+                                        <td class="text-center">{{ entry.req_char }}</td>
+                                        <td class="text-center">{{ entry.req_char.corporation_name }}</td>
+                                        <td class="text-center">{{ entry.type_to_str }}</td>
+                                        {% if entry.request_type is None %}
+                                            <td class="text-center"> Removed</td>
+                                        {% else %}
+                                            <td class="text-center">{{ entry.action_to_str }}</td>
+                                        {% endif %}
+                                        <td class="text-center">{{ entry.request_actor }}</td>
+                                    </tr>
+                                {% endfor %}
                             </tbody>
                         </table>
+                        <p class="text-muted">
+                            All times displayed are EVE/UTC.
+                        </p>
                     </div>
-                {% else %}
-                    <div class="alert alert-warning text-center">{% trans "No entries found for this group." %}</div>
+                {% else %}                                        
+                    <div class="clearfix"></div>
+                    <br>
+                    <div class="alert alert-warning text-center">                        
+                        {% trans "No entries found for this group." %}
+                    </div>                    
                 {% endif %}
             </div>        
         </div>
     </div>
 {% endblock %}
+
 {% block extra_javascript %}
     {% include 'bundles/datatables-js.html' %}
+    <script type="text/javascript" src="{% static 'js/filterDropDown/filterDropDown.min.js' %}"></script>
 {% endblock %}
+
 {% block extra_css %}
     {% include 'bundles/datatables-css.html' %}
 {% endblock %}
+
 {% block extra_script %}
     $(document).ready(function(){
-        $('#log-entries').DataTable();
+        $('#log-entries').DataTable({
+            order: [[ 0, 'desc' ], [ 1, 'asc' ] ],
+            filterDropDown:
+            {
+                columns: [                                       
+                    {
+                        idx: 1
+                    },
+                    {
+                        idx: 2
+                    },
+                    {
+                        idx: 3
+                    },
+                    {
+                        idx: 4
+                    },
+                    {
+                        idx: 5
+                    },
+                    {
+                        idx: 6
+                    }
+                ],
+                bootstrap: true
+            },
+        });
     });
 {% endblock %}
 

allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html

@@ -4,7 +4,6 @@
 {% load evelinks %}
 
 {% block page_title %}{% trans "Group Members" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
@@ -15,57 +14,89 @@
             <div class="panel-heading">
                 {{ group.name }} - {% trans 'Members' %}
             </div>
-            <div class="panel-body">
-                <div id="list" class="">
-                    {% if group.user_set %}
-                    <table class="table">
-                        <tr>                    
-                            <th class="text-center">{% trans "Leader" %}</th>
-                            <th class="text-center">{% trans "Portrait" %}</th>
-                            <th class="text-center">{% trans "Character" %}</th>
-                            <th class="text-center">{% trans "Corporation" %}</th>
-                            <th class="text-center">{% trans "Alliance" %}</th>
-                            <th class="text-center">{% trans "Action" %}</th>
-                        </tr>
-                        {% for member in members %}
-                            <tr>                        
-                                <td class="text-center">
-                                    {% if member.is_leader %}
-                                    <i class="fa fa-star"></i>
-                                    {% endif %}
-                                </td>
-                                <td class="text-center">
-                                    <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">
-                                </td>
-                                <td class="text-center">
-                                    <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
-                                        {{ member.main_char.character_name }}
-                                    </a>
-                                </td>
-                                <td class="text-center">
-                                    <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
-                                        {{ member.main_char.corporation_name }}
-                                    </a>
-                                </td>                        
-                                <td class="text-center">
-                                    <a href="{{ member.main_char|dotlan_alliance_url }}" target="_blank">
-                                        {{ member.main_char.alliance_name|default_if_none:"" }}
-                                    </a>
-                                </td>
-                                <td class="text-center">
-                                    <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger"
-                                        title="{% trans "Remove from group" %}">
-                                            <i class="glyphicon glyphicon-remove"></i>
-                                    </a>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </table>
-                    {% else %}
-                        <div class="alert alert-warning text-center">{% trans "No group members to list." %}</div>
-                    {% endif %}
-                </div>
+            <div class="panel-body">                
+                <p>                    
+                    <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
+                        {% trans "Back" %}
+                    </a>
+                </p>                
+                {% if group.user_set %}                    
+                    <div class="table-responsive">
+                        <table class="table table-aa" id="tab_group_members">
+                            <thead>
+                                <tr>                                                        
+                                    <th class="text-right">{% trans "Portrait" %}</th>
+                                    <th class="text-center">{% trans "Character" %}</th>
+                                    <th class="text-center">{% trans "Organization" %}</th>                                    
+                                    <th class="text-center"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for member in members %}
+                                    <tr>                                                                
+                                        <td class="text-right">
+                                            {% if member.is_leader %}
+                                                <i class="fa fa-star"></i>&nbsp;
+                                            {% endif %}
+                                            <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">                                            
+                                        </td>
+                                        <td class="text-center">
+                                            {% if member.main_char %}
+                                                <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
+                                                    {{ member.main_char.character_name }}
+                                                </a>
+                                            {% else %}
+                                                {{ member.user.username }}
+                                            {% endif %}
+                                        </td>
+                                        <td class="text-center">
+                                            {% if member.main_char %}
+                                                <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
+                                                    {{ member.main_char.corporation_name }}
+                                                </a><br>
+                                                {{ member.main_char.alliance_name|default_if_none:"" }}
+                                            {% else %}
+                                                (unknown)
+                                            {% endif %}
+                                        </td>                                                                
+                                        <td class="text-center">
+                                            <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger"
+                                                title="{% trans "Remove from group" %}">
+                                                    <i class="glyphicon glyphicon-remove"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                        <p class="text-muted"><i class="fa fa-star"></i>: Group leader</p>
+                    </div>
+                {% else %}
+                    <div class="alert alert-warning text-center">
+                        {% trans "No group members to list." %}
+                    </div>
+                {% endif %}
             </div>
+            
         </div>
     </div>
 {% endblock content %}
+
+{% block extra_javascript %}
+    {% include 'bundles/datatables-js.html' %}
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css.html' %}
+{% endblock %}
+
+{% block extra_script %}
+    $(document).ready(function(){
+        $('#tab_group_members').DataTable({
+            order: [ [ 1, "asc" ] ],
+            columnDefs: [
+                { "sortable": false, "targets": [0, 3] },
+            ]
+        });
+    });
+{% endblock %}

allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html

@@ -11,48 +11,58 @@
         {% include 'groupmanagement/menu.html' %}
         <div class="panel panel-default">
             <div class="panel-heading">
-                Groups
+                {% trans "Groups" %}
             </div>
             <div class="panel-body">
                 {% if groups %}                    
-                    <table class="table">
-                        <tr>
-                            <th class="text-center">{% trans "Name" %}</th>
-                            <th class="text-center">{% trans "Description" %}</th>
-                            <th class="text-center">{% trans "Status" %}</th>
-                            <th class="text-center">{% trans "Member Count" %}</th>
-                            <th class="text-center">{% trans "Action" %}</th>
-                        </tr>
-                        {% for group in groups %}
-                            <tr>
-                                <td class="text-center">{{ group.name }}</td>
-                                <td class="text-center">{{ group.authgroup.description }}</td>
-                                <td class="text-center">
-                                    {% if group.authgroup.hidden %}
-                                        <span class="label label-info">{% trans "Hidden" %}</span>
-                                    {% elif group.authgroup.open %}
-                                        <span class="label label-success">{% trans "Open" %}</span>
-                                    {% else %}
-                                        <span class="label label-default">{% trans "Requestable" %}</span>
-                                    {% endif %}
-                                </td>
-                                <td class="text-center">
-                                    {{ group.num_members }}
-                                </td>
-                                <td class="text-center">
-                                    <a href="{% url 'groupmanagement:membership_list' group.id %}" class="btn btn-primary"
-                                        title="{% trans "View Members" %}">
-                                            <i class="glyphicon glyphicon-eye-open"></i>
-                                    </a>
-                                    <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}">
-                                        <i class="glyphicon glyphicon-list-alt"></i>
-                                    </a>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </table>
+                    <div class="table-responsive">
+                        <table class="table table-aa">
+                            <thead>
+                                <tr>
+                                    <th class="text-center">{% trans "Name" %}</th>
+                                    <th class="text-center">{% trans "Description" %}</th>
+                                    <th class="text-center">{% trans "Status" %}</th>
+                                    <th class="text-center">{% trans "Member Count" %}</th>
+                                    <th class="text-center"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for group in groups %}
+                                    <tr>
+                                        <td class="text-center">
+                                            <a href="{% url 'groupmanagement:membership_list' group.id %}">{{ group.name }}</a>
+                                        </td>
+                                        <td class="text-center">{{ group.authgroup.description }}</td>
+                                        <td class="text-center">
+                                            {% if group.authgroup.hidden %}
+                                                <span class="label label-info">{% trans "Hidden" %}</span>
+                                            {% elif group.authgroup.open %}
+                                                <span class="label label-success">{% trans "Open" %}</span>
+                                            {% else %}
+                                                <span class="label label-default">{% trans "Requestable" %}</span>
+                                            {% endif %}
+                                        </td>
+                                        <td class="text-center">
+                                            {{ group.num_members }}
+                                        </td>
+                                        <td class="text-center">
+                                            <a href="{% url 'groupmanagement:membership_list' group.id %}" class="btn btn-primary"
+                                                title="{% trans "View Members" %}">
+                                                    <i class="glyphicon glyphicon-eye-open"></i>
+                                            </a>
+                                            <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}">
+                                                <i class="glyphicon glyphicon-list-alt"></i>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
                 {% else %}
-                    <div class="alert alert-warning text-center">{% trans "No groups to list." %}</div>
+                    <div class="alert alert-warning text-center">
+                        {% trans "No groups to list." %}
+                    </div>
                 {% endif %}
             </div>
         </div>

allianceauth/groupmanagement/templates/groupmanagement/groups.html

@@ -9,49 +9,54 @@ url
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% trans "Available Groups" %}</h1>
         {% if groups %}
-        <table class="table">
-            <tr>
-                <th class="text-center">{% trans "Name" %}</th>
-                <th class="text-center">{% trans "Description" %}</th>
-                <th class="text-center">{% trans "Action" %}</th>
-            </tr>
-
-            {% for g in groups %}
-                <tr>
-                    <td class="text-center">{{ g.group.name }}</td>
-                    <td class="text-center">{{ g.group.authgroup.description|urlize }}</td>
-                    <td class="text-center">
-                        {% if g.group in user.groups.all %}
-                            {% if not g.request %}
-                                <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
-                                    {% trans "Leave" %}
-                                </a>
-                            {% else %}
-                                <button type="button" class="btn btn-primary" disabled>
-                                    {{ g.request.status }}
-                                </button>
-                            {% endif %}
-                        {% elif not g.request %}
-                            {% if g.group.authgroup.open %}
-                                <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
-                                    {% trans "Join" %}
-                                </a>
-                            {% else %}
-                                <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
-                                    {% trans "Request" %}
-                                </a>
-                            {% endif %}
-                        {% else %}
-                            <button type="button" class="btn btn-primary" disabled>
-                                {{ g.request.status }}
-                            </button>
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endfor %}
-        </table>
+            <table class="table table-aa">
+                <thead>
+                    <tr>
+                        <th class="text-center">{% trans "Name" %}</th>
+                        <th class="text-center">{% trans "Description" %}</th>
+                        <th class="text-center">{% trans "Action" %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for g in groups %}
+                        <tr>
+                            <td class="text-center">{{ g.group.name }}</td>
+                            <td class="text-center">{{ g.group.authgroup.description|urlize }}</td>
+                            <td class="text-center">
+                                {% if g.group in user.groups.all %}
+                                    {% if not g.request %}
+                                        <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
+                                            {% trans "Leave" %}
+                                        </a>
+                                    {% else %}
+                                        <button type="button" class="btn btn-primary" disabled>
+                                            {{ g.request.status }}
+                                        </button>
+                                    {% endif %}
+                                {% elif not g.request %}
+                                    {% if g.group.authgroup.open %}
+                                        <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
+                                            {% trans "Join" %}
+                                        </a>
+                                    {% else %}
+                                        <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
+                                            {% trans "Request" %}
+                                        </a>
+                                    {% endif %}
+                                {% else %}
+                                    <button type="button" class="btn btn-primary" disabled>
+                                        {{ g.request.status }}
+                                    </button>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
         {% else %}
-        <div class="alert alert-warning text-center">{% trans "No groups available." %}</div>
+            <div class="alert alert-warning text-center">
+                {% trans "No groups available." %}
+            </div>
         {% endif %}
     </div>
 

allianceauth/groupmanagement/templates/groupmanagement/index.html

@@ -20,8 +20,8 @@
         {% include 'groupmanagement/menu.html' %}
         
         <ul class="nav nav-tabs">
-            <li class="active"><a data-toggle="tab" href="#add">{% trans "Group Add Requests" %}</a></li>
-            <li><a data-toggle="tab" href="#leave">{% trans "Group Leave Requests" %}</a></li>
+            <li class="active"><a data-toggle="tab" href="#add">{% trans "Join Requests" %}</a></li>
+            <li><a data-toggle="tab" href="#leave">{% trans "Leave Requests" %}</a></li>
         </ul>
         
         <div class="tab-content">
@@ -29,49 +29,56 @@
             <div id="add" class="tab-pane fade in active panel panel-default">
                 <div class="panel-body">
                 {% if acceptrequests %}
-                    <table class="table">
-                        <tr>
-                            <th class="text-center">{% trans "#" %}</th>
-                            <th class="text-center">{% trans "Portrait" %}</th>
-                            <th class="text-center">{% trans "Character" %}</th>
-                            <th class="text-center">{% trans "Corporation" %}</th>
-                            <th class="text-center">{% trans "Alliance" %}</th>
-                            <th class="text-center">{% trans "Group" %}</th>
-                            <th class="text-center"></th>
-                        </tr>
-                        {% for acceptrequest in acceptrequests %}
-                            <tr>
-                                <td class="text-center">{{ acceptrequest.id }}</td>
-                                <td class="text-center">
-                                    <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle">
-                                </td>
-                                <td class="text-center">
-                                    <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
-                                        {{ acceptrequest.main_char.character_name }}
-                                    </a>
-                                </td>
-                                <td class="text-center">
-                                    <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                        {{ acceptrequest.main_char.corporation_name }}
-                                    </a>
-                                </td>
-                                <td class="text-center">
-                                    <a href="{{ acceptrequest.main_char|dotlan_alliance_url }}" target="_blank">
-                                        {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
-                                    </a>
-                                </td>                     
-                                <td class="text-center">{{ acceptrequest.group.name }}</td>
-                                <td class="text-center">
-                                    <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
-                                        {% trans "Accept" %}
-                                    </a>
-                                    <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                                        {% trans "Reject" %}
-                                    </a>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </table>
+                    <div class="table-responsive">
+                        <table class="table table-aa">
+                            <thead>
+                                <tr>                                    
+                                    <th class="text-center"></th>
+                                    <th class="text-center">{% trans "Character" %}</th>
+                                    <th class="text-center">{% trans "Organization" %}</th>                                    
+                                    <th class="text-center">{% trans "Group" %}</th>
+                                    <th class="text-center"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for acceptrequest in acceptrequests %}
+                                    <tr>                                        
+                                        <td class="text-right">
+                                            <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle">
+                                        </td>
+                                        <td class="text-center">                                          
+                                            {% if acceptrequest.main_char %}
+                                                <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
+                                                    {{ acceptrequest.main_char.character_name }}
+                                                </a>
+                                            {% else %}
+                                                {{ acceptrequest.user.username }}
+                                            {% endif %}
+                                        </td>
+                                        <td class="text-center">
+                                            {% if acceptrequest.main_char %}
+                                                <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                    {{ acceptrequest.main_char.corporation_name }}
+                                                </a><br>
+                                                {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
+                                            {% else %}
+                                                (unknown)
+                                            {% endif %}
+                                        </td>                                        
+                                        <td class="text-center">{{ acceptrequest.group.name }}</td>
+                                        <td class="text-center">
+                                            <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
+                                                {% trans "Accept" %}
+                                            </a>
+                                            <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
+                                                {% trans "Reject" %}
+                                            </a>
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
                 {% else %}
                     <div class="alert alert-warning text-center">{% trans "No group add requests." %}</div>
                 {% endif %}
@@ -81,49 +88,56 @@
             <div id="leave" class="tab-pane fade panel panel-default">
                 <div class="panel-body">
                 {% if leaverequests %}
-                    <table class="table">
-                        <tr>
-                            <th class="text-center">{% trans "#" %}</th>
-                            <th class="text-center">{% trans "Portrait" %}</th>
-                            <th class="text-center">{% trans "Character" %}</th>
-                            <th class="text-center">{% trans "Corporation" %}</th>
-                            <th class="text-center">{% trans "Alliance" %}</th>
-                            <th class="text-center">{% trans "Group" %}</th>
-                            <th class="text-center"></th>
-                        </tr>
-                        {% for leaverequest in leaverequests %}
-                            <tr>
-                                <td class="text-center">{{ leaverequest.id }}</td>
-                                <td class="text-center">
-                                    <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle">
-                                </td>
-                                <td class="text-center">
-                                    <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
-                                        {{ leaverequest.main_char.character_name }}
-                                    </a>
-                                </td>
-                                <td class="text-center">
-                                    <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                        {{ leaverequest.main_char.corporation_name }}
-                                    </a>
-                                </td>
-                                <td class="text-center">
-                                    <a href="{{ leaverequest.main_char|dotlan_alliance_url }}" target="_blank">
-                                        {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
-                                    </a>
-                                </td>  
-                                <td class="text-center">{{ leaverequest.group.name }}</td>
-                                <td class="text-center">
-                                    <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
-                                        {% trans "Accept" %}
-                                    </a>
-                                    <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
-                                        {% trans "Reject" %}
-                                    </a>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </table>
+                    <div class="table-responsive">
+                        <table class="table table-aa">
+                            <thead>
+                                <tr>                                    
+                                    <th class="text-center"></th>
+                                    <th class="text-center">{% trans "Character" %}</th>
+                                    <th class="text-center">{% trans "Organization" %}</th>                                    
+                                    <th class="text-center">{% trans "Group" %}</th>
+                                    <th class="text-center"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for leaverequest in leaverequests %}
+                                    <tr>                                        
+                                        <td class="text-right">
+                                            <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle">
+                                        </td>
+                                        <td class="text-center">
+                                            {% if leaverequest.main_char %}
+                                                <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
+                                                    {{ leaverequest.main_char.character_name }}
+                                                </a>
+                                            {% else %}
+                                                {{ leaverequest.user.username }}
+                                            {% endif %}
+                                        </td>
+                                        <td class="text-center">
+                                            {% if leaverequest.main_char %}
+                                                <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                    {{ leaverequest.main_char.corporation_name }}
+                                                </a><br>
+                                                {{ leaverequest.main_char.alliance_name|default_if_none:"" }}                               
+                                            {% else %}
+                                                (unknown)
+                                            {% endif %}
+                                        </td>                                        
+                                        <td class="text-center">{{ leaverequest.group.name }}</td>
+                                        <td class="text-center">
+                                            <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
+                                                {% trans "Accept" %}
+                                            </a>
+                                            <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
+                                                {% trans "Reject" %}
+                                            </a>
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
                 {% else %}
                     <div class="alert alert-warning text-center">{% trans "No group leave requests." %}</div>
                 {% endif %}

allianceauth/groupmanagement/tests.py

@@ -1,92 +0,0 @@
-from unittest import mock
-
-from django.test import TestCase
-from allianceauth.tests.auth_utils import AuthUtils
-from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo, EveCharacter
-from django.contrib.auth.models import User, Group
-from allianceauth.groupmanagement.managers import GroupManager
-from allianceauth.groupmanagement.signals import check_groups_on_state_change
-
-class GroupManagementVisibilityTestCase(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.user = AuthUtils.create_user('test')
-        AuthUtils.add_main_character(cls.user, 'test character', '1', corp_id='2', corp_name='test_corp', corp_ticker='TEST', alliance_id='3', alliance_name='TEST')
-        cls.user.profile.refresh_from_db()
-        cls.alliance = EveAllianceInfo.objects.create(alliance_id='3', alliance_name='test alliance', alliance_ticker='TEST', executor_corp_id='2')
-        cls.corp = EveCorporationInfo.objects.create(corporation_id='2', corporation_name='test corp', corporation_ticker='TEST', alliance=cls.alliance, member_count=1)
-        cls.group1 = Group.objects.create(name='group1')
-        cls.group2 = Group.objects.create(name='group2')
-        cls.group3 = Group.objects.create(name='group3')
-
-    def setUp(self):
-        self.user.refresh_from_db()
-
-    def _refresh_user(self):
-        self.user = User.objects.get(pk=self.user.pk)
-
-
-    def test_can_manage_group(self):
-        
-
-        self.group1.authgroup.group_leaders.add(self.user)
-        self.group2.authgroup.group_leader_groups.add(self.group1)
-        self._refresh_user()
-        groups = GroupManager.get_group_leaders_groups(self.user)
-
-        self.assertIn(self.group1, groups) #avail due to user
-        self.assertNotIn(self.group2, groups) #not avail due to group
-        self.assertNotIn(self.group3, groups) #not avail at all 
-
-        self.user.groups.add(self.group1)
-        self._refresh_user()
-        groups = GroupManager.get_group_leaders_groups(self.user)
-
-        self.assertIn(self.group1, groups) #avail due to user
-        self.assertIn(self.group2, groups) #avail due to group1
-        self.assertNotIn(self.group3, groups) #not avail at all 
-
-class GroupManagementStateTestCase(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.user = AuthUtils.create_user('test')
-        AuthUtils.add_main_character(cls.user, 'test character', '1', corp_id='2', corp_name='test_corp', corp_ticker='TEST', alliance_id='3', alliance_name='TEST')
-        cls.user.profile.refresh_from_db()
-        cls.alliance = EveAllianceInfo.objects.create(alliance_id='3', alliance_name='test alliance', alliance_ticker='TEST', executor_corp_id='2')
-        cls.corp = EveCorporationInfo.objects.create(corporation_id='2', corporation_name='test corp', corporation_ticker='TEST', alliance=cls.alliance, member_count=1)
-        cls.state_group = Group.objects.create(name='state_group')
-        cls.open_group = Group.objects.create(name='open_group')
-        cls.state = AuthUtils.create_state('test state', 500)
-        cls.state_group.authgroup.states.add(cls.state)
-        cls.state_group.authgroup.internal = False
-        cls.state_group.save()
-
-    def setUp(self):
-        self.user.refresh_from_db()
-        self.state.refresh_from_db()
-
-    def _refresh_user(self):
-        self.user = User.objects.get(pk=self.user.pk)
-
-    def _refresh_test_group(self):
-        self.state_group = Group.objects.get(pk=self.state_group.pk)
-
-    def test_drop_state_group(self):
-
-        self.user.groups.add(self.open_group)
-        self.user.groups.add(self.state_group)     
-        self.assertEqual(self.user.profile.state.name, "Guest")
-
-        self.state.member_corporations.add(self.corp)
-        self._refresh_user()
-        self.assertEqual(self.user.profile.state, self.state)
-        groups = self.user.groups.all()
-        self.assertIn(self.state_group, groups) #keeps group
-        self.assertIn(self.open_group, groups) #public group unafected
-
-        self.state.member_corporations.clear()
-        self._refresh_user()
-        self.assertEqual(self.user.profile.state.name, "Guest")
-        groups = self.user.groups.all()
-        self.assertNotIn(self.state_group, groups) #looses group
-        self.assertIn(self.open_group, groups) #public group unafected

allianceauth/groupmanagement/tests/__init__.py

@@ -0,0 +1,11 @@
+from django.urls import reverse
+
+
+def get_admin_change_view_url(obj: object) -> str:
+    return reverse(
+        'admin:{}_{}_change'.format(
+            obj._meta.app_label,
+            type(obj).__name__.lower()
+        ),
+        args=(obj.pk,)
+    )

allianceauth/groupmanagement/tests/test_admin.py

@@ -0,0 +1,397 @@
+from unittest.mock import patch
+
+from django.conf import settings
+from django.contrib import admin
+from django.contrib.admin.sites import AdminSite
+from django.contrib.auth.models import User
+from django.test import TestCase, RequestFactory, Client
+
+from allianceauth.authentication.models import CharacterOwnership, State
+from allianceauth.eveonline.models import (
+    EveCharacter, EveCorporationInfo, EveAllianceInfo
+)
+
+from ..admin import (   
+   HasLeaderFilter,
+   GroupAdmin,   
+   Group
+)
+from . import get_admin_change_view_url
+
+if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
+    _has_auto_groups = True
+    from allianceauth.eveonline.autogroups.models import AutogroupsConfig
+    from ..admin import IsAutoGroupFilter
+else:
+    _has_auto_groups = False
+
+
+MODULE_PATH = 'allianceauth.groupmanagement.admin'
+
+
+class MockRequest(object):
+    
+    def __init__(self, user=None):
+        self.user = user
+
+
+class TestGroupAdmin(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # group 1 - has leader
+        cls.group_1 = Group.objects.create(name='Group 1')        
+        cls.group_1.authgroup.description = 'Default Group'
+        cls.group_1.authgroup.internal = False
+        cls.group_1.authgroup.hidden = False
+        cls.group_1.authgroup.save()
+
+        # group 2 - no leader
+        cls.group_2 = Group.objects.create(name='Group 2')
+        cls.group_2.authgroup.description = 'Internal Group'
+        cls.group_2.authgroup.internal = True        
+        cls.group_2.authgroup.save()
+
+        # group 3 - has leader
+        cls.group_3 = Group.objects.create(name='Group 3')
+        cls.group_3.authgroup.description = 'Hidden Group'
+        cls.group_3.authgroup.internal = False
+        cls.group_3.authgroup.hidden = True
+        cls.group_3.authgroup.save()
+
+        # group 4 - no leader
+        cls.group_4 = Group.objects.create(name='Group 4')
+        cls.group_4.authgroup.description = 'Open Group'
+        cls.group_4.authgroup.internal = False
+        cls.group_4.authgroup.hidden = False
+        cls.group_4.authgroup.open = True
+        cls.group_4.authgroup.save()
+
+        # group 5 - no leader
+        cls.group_5 = Group.objects.create(name='Group 5')
+        cls.group_5.authgroup.description = 'Public Group'
+        cls.group_5.authgroup.internal = False
+        cls.group_5.authgroup.hidden = False
+        cls.group_5.authgroup.public = True
+        cls.group_5.authgroup.save()
+
+        # group 6 - no leader
+        cls.group_6 = Group.objects.create(name='Group 6')
+        cls.group_6.authgroup.description = 'Mixed Group'
+        cls.group_6.authgroup.internal = False
+        cls.group_6.authgroup.hidden = True
+        cls.group_6.authgroup.open = True
+        cls.group_6.authgroup.public = True
+        cls.group_6.authgroup.save()
+        
+        # user 1 - corp and alliance, normal user
+        cls.character_1 = EveCharacter.objects.create(
+            character_id='1001',
+            character_name='Bruce Wayne',
+            corporation_id='2001',
+            corporation_name='Wayne Technologies',
+            corporation_ticker='WT',
+            alliance_id='3001',
+            alliance_name='Wayne Enterprises',
+            alliance_ticker='WE',
+        )
+        cls.character_1a = EveCharacter.objects.create(
+            character_id='1002',
+            character_name='Batman',
+            corporation_id='2001',
+            corporation_name='Wayne Technologies',
+            corporation_ticker='WT',
+            alliance_id='3001',
+            alliance_name='Wayne Enterprises',
+            alliance_ticker='WE',
+        )
+        alliance = EveAllianceInfo.objects.create(
+            alliance_id='3001',
+            alliance_name='Wayne Enterprises',
+            alliance_ticker='WE',            
+            executor_corp_id='2001'
+        )
+        EveCorporationInfo.objects.create(
+            corporation_id='2001',
+            corporation_name='Wayne Technologies',
+            corporation_ticker='WT',            
+            member_count=42,
+            alliance=alliance
+        )        
+        cls.user_1 = User.objects.create_user(
+            cls.character_1.character_name.replace(' ', '_'),
+            'abc@example.com',
+            'password'
+        )
+        CharacterOwnership.objects.create(
+            character=cls.character_1,
+            owner_hash='x1' + cls.character_1.character_name,
+            user=cls.user_1
+        )
+        CharacterOwnership.objects.create(
+            character=cls.character_1a,
+            owner_hash='x1' + cls.character_1a.character_name,
+            user=cls.user_1
+        )
+        cls.user_1.profile.main_character = cls.character_1
+        cls.user_1.profile.save()
+        cls.user_1.groups.add(cls.group_1)
+        cls.group_1.authgroup.group_leaders.add(cls.user_1)
+
+        # user 2 - corp only, staff
+        cls.character_2 = EveCharacter.objects.create(
+            character_id=1003,
+            character_name='Clark Kent',
+            corporation_id=2002,
+            corporation_name='Daily Planet',
+            corporation_ticker='DP',
+            alliance_id=None
+        )
+        EveCorporationInfo.objects.create(
+            corporation_id=2002,
+            corporation_name='Daily Plane',
+            corporation_ticker='DP',            
+            member_count=99,
+            alliance=None
+        )
+        cls.user_2 = User.objects.create_user(
+            cls.character_2.character_name.replace(' ', '_'),
+            'abc@example.com',
+            'password'
+        )
+        CharacterOwnership.objects.create(
+            character=cls.character_2,
+            owner_hash='x1' + cls.character_2.character_name,
+            user=cls.user_2
+        )
+        cls.user_2.profile.main_character = cls.character_2
+        cls.user_2.profile.save()
+        cls.user_2.groups.add(cls.group_2)
+        cls.user_2.is_staff = True
+        cls.user_2.save()
+        
+        # user 3 - no main, no group, superuser
+        cls.character_3 = EveCharacter.objects.create(
+            character_id=1101,
+            character_name='Lex Luthor',
+            corporation_id=2101,
+            corporation_name='Lex Corp',
+            corporation_ticker='LC',
+            alliance_id=None
+        )
+        EveCorporationInfo.objects.create(
+            corporation_id=2101,
+            corporation_name='Lex Corp',
+            corporation_ticker='LC',            
+            member_count=666,
+            alliance=None
+        )
+        EveAllianceInfo.objects.create(
+            alliance_id='3101',
+            alliance_name='Lex World Domination',
+            alliance_ticker='LWD',
+            executor_corp_id=''
+        )
+        cls.user_3 = User.objects.create_user(
+            cls.character_3.character_name.replace(' ', '_'),
+            'abc@example.com',
+            'password'
+        )
+        CharacterOwnership.objects.create(
+            character=cls.character_3,
+            owner_hash='x1' + cls.character_3.character_name,
+            user=cls.user_3
+        )
+        cls.user_3.is_superuser = True
+        cls.user_3.save()
+        cls.user_3.groups.add(cls.group_3)
+        cls.group_3.authgroup.group_leaders.add(cls.user_3)
+
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.modeladmin = GroupAdmin(
+            model=Group, admin_site=AdminSite()
+        )
+
+    def _create_autogroups(self):
+        """create autogroups for corps and alliances"""
+        if _has_auto_groups:
+            autogroups_config = AutogroupsConfig(
+                corp_groups = True,
+                alliance_groups = True
+            )
+            autogroups_config.save()
+            for state in State.objects.all():
+                autogroups_config.states.add(state)
+            autogroups_config.update_corp_group_membership(self.user_1)
+    
+    # column rendering
+
+    def test_description(self):
+        expected = 'Default Group'
+        result = self.modeladmin._description(self.group_1)
+        self.assertEqual(result, expected)
+
+    def test_member_count(self):        
+        expected = 1
+        obj = self.modeladmin.get_queryset(MockRequest(user=self.user_1))\
+            .get(pk=self.group_1.pk)
+        result = self.modeladmin._member_count(obj)
+        self.assertEqual(result, expected)
+
+    def test_has_leader(self):        
+        result = self.modeladmin.has_leader(self.group_1)
+        self.assertTrue(result)
+
+    def test_properties_1(self):
+        expected = ['Default']
+        result = self.modeladmin._properties(self.group_1)
+        self.assertListEqual(result, expected)
+
+    def test_properties_2(self):
+        expected = ['Internal']
+        result = self.modeladmin._properties(self.group_2)
+        self.assertListEqual(result, expected)
+
+    def test_properties_3(self):
+        expected = ['Hidden']
+        result = self.modeladmin._properties(self.group_3)
+        self.assertListEqual(result, expected)
+
+    def test_properties_4(self):
+        expected = ['Open']
+        result = self.modeladmin._properties(self.group_4)
+        self.assertListEqual(result, expected)
+
+    def test_properties_5(self):
+        expected = ['Public']
+        result = self.modeladmin._properties(self.group_5)
+        self.assertListEqual(result, expected)
+
+    def test_properties_6(self):
+        expected = ['Hidden', 'Open', 'Public']
+        result = self.modeladmin._properties(self.group_6)
+        self.assertListEqual(result, expected)
+
+    if _has_auto_groups:
+        @patch(MODULE_PATH + '._has_auto_groups', True)
+        def test_properties_6(self):
+            self._create_autogroups()
+            expected = ['Auto Group']
+            my_group = Group.objects\
+                .filter(managedcorpgroup__isnull=False)\
+                .first()
+            result = self.modeladmin._properties(my_group)
+            self.assertListEqual(result, expected)
+
+    # actions
+   
+    # filters
+    
+    if _has_auto_groups:
+        @patch(MODULE_PATH + '._has_auto_groups', True)
+        def test_filter_is_auto_group(self):
+            
+            class GroupAdminTest(admin.ModelAdmin): 
+                list_filter = (IsAutoGroupFilter,)
+                    
+            self._create_autogroups()        
+            my_modeladmin = GroupAdminTest(Group, AdminSite())
+
+            # Make sure the lookups are correct
+            request = self.factory.get('/')
+            request.user = self.user_1
+            changelist = my_modeladmin.get_changelist_instance(request)
+            filters = changelist.get_filters(request)
+            filterspec = filters[0][0]
+            expected = [
+                ('yes', 'Yes'),
+                ('no', 'No'),
+            ]
+            self.assertEqual(filterspec.lookup_choices, expected)
+
+            # Make sure the correct queryset is returned - no
+            request = self.factory.get(
+                '/', {'is_auto_group__exact': 'no'}
+            )
+            request.user = self.user_1
+            changelist = my_modeladmin.get_changelist_instance(request)
+            queryset = changelist.get_queryset(request)
+            expected = [
+                self.group_1,
+                self.group_2,
+                self.group_3,
+                self.group_4,
+                self.group_5,
+                self.group_6
+            ]
+            self.assertSetEqual(set(queryset), set(expected))
+
+            # Make sure the correct queryset is returned - yes
+            request = self.factory.get(
+                '/', {'is_auto_group__exact': 'yes'}
+            )
+            request.user = self.user_1
+            changelist = my_modeladmin.get_changelist_instance(request)
+            queryset = changelist.get_queryset(request)
+            expected = Group.objects.exclude(
+                        managedalliancegroup__isnull=True, 
+                        managedcorpgroup__isnull=True
+            )
+            self.assertSetEqual(set(queryset), set(expected))
+         
+    def test_filter_has_leader(self):
+        
+        class GroupAdminTest(admin.ModelAdmin): 
+            list_filter = (HasLeaderFilter,)
+                
+        self._create_autogroups()        
+        my_modeladmin = GroupAdminTest(Group, AdminSite())
+
+        # Make sure the lookups are correct
+        request = self.factory.get('/')
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        filters = changelist.get_filters(request)
+        filterspec = filters[0][0]
+        expected = [
+            ('yes', 'Yes'),
+            ('no', 'No'),
+        ]
+        self.assertEqual(filterspec.lookup_choices, expected)
+
+        # Make sure the correct queryset is returned - no
+        request = self.factory.get(
+            '/', {'has_leader__exact': 'no'}
+        )
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        queryset = changelist.get_queryset(request)
+        expected = Group.objects.exclude(pk__in=[
+            self.group_1.pk, self.group_3.pk
+        ])
+        self.assertSetEqual(set(queryset), set(expected))
+
+        # Make sure the correct queryset is returned - yes
+        request = self.factory.get(
+            '/', {'has_leader__exact': 'yes'}
+        )
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        queryset = changelist.get_queryset(request)
+        expected = [
+            self.group_1,            
+            self.group_3
+        ]
+        self.assertSetEqual(set(queryset), set(expected))
+    
+    def test_change_view_loads_normally(self):
+        User.objects.create_superuser(
+            username='superuser', password='secret', email='admin@example.com'
+        )
+        c = Client()
+        c.login(username='superuser', password='secret')                
+        response = c.get(get_admin_change_view_url(self.group_1))
+        self.assertEqual(response.status_code, 200)

allianceauth/groupmanagement/tests/test_managers.py

@@ -0,0 +1,337 @@
+from unittest.mock import Mock, patch
+
+from django.contrib.auth.models import Group, User
+from django.test import TestCase
+from django.urls import reverse
+
+from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo
+from allianceauth.tests.auth_utils import AuthUtils
+
+from ..models import AuthGroup
+from ..managers import GroupManager
+
+
+class MockUserNotAuthenticated():
+    def __init__(self):
+        self.is_authenticated = False
+
+class GroupManagementVisibilityTestCase(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.user = AuthUtils.create_user('test')
+        AuthUtils.add_main_character(
+            cls.user, 'test character', '1', corp_id='2', corp_name='test_corp', corp_ticker='TEST', alliance_id='3', alliance_name='TEST'
+        )
+        cls.user.profile.refresh_from_db()
+        cls.alliance = EveAllianceInfo.objects.create(alliance_id='3', alliance_name='test alliance', alliance_ticker='TEST', executor_corp_id='2')
+        cls.corp = EveCorporationInfo.objects.create(
+            corporation_id='2', corporation_name='test corp', corporation_ticker='TEST', alliance=cls.alliance, member_count=1
+        )
+        cls.group1 = Group.objects.create(name='group1')
+        cls.group2 = Group.objects.create(name='group2')
+        cls.group3 = Group.objects.create(name='group3')
+
+    def setUp(self):
+        self.user.refresh_from_db()
+
+    def _refresh_user(self):
+        self.user = User.objects.get(pk=self.user.pk)
+
+
+    def test_get_group_leaders_groups(self):
+        self.group1.authgroup.group_leaders.add(self.user)
+        self.group2.authgroup.group_leader_groups.add(self.group1)
+        self._refresh_user()
+        groups = GroupManager.get_group_leaders_groups(self.user)
+
+        self.assertIn(self.group1, groups) #avail due to user
+        self.assertNotIn(self.group2, groups) #not avail due to group
+        self.assertNotIn(self.group3, groups) #not avail at all 
+
+        self.user.groups.add(self.group1)
+        self._refresh_user()
+        groups = GroupManager.get_group_leaders_groups(self.user)
+
+
+    def test_can_manage_group(self):
+        self.group1.authgroup.group_leaders.add(self.user)
+        self.user.groups.add(self.group1)
+        self._refresh_user()
+
+        self.assertTrue(GroupManager.can_manage_group(self.user, self.group1))
+        self.assertFalse(GroupManager.can_manage_group(self.user, self.group2))
+        self.assertFalse(GroupManager.can_manage_group(self.user, self.group3))
+        
+        self.group2.authgroup.group_leader_groups.add(self.group1)
+        self.group1.authgroup.group_leaders.remove(self.user)
+        self._refresh_user()
+
+        self.assertFalse(GroupManager.can_manage_group(self.user, self.group1))
+        self.assertTrue(GroupManager.can_manage_group(self.user, self.group2))
+        self.assertFalse(GroupManager.can_manage_group(self.user, self.group3))
+
+
+class TestGroupManager(TestCase):
+        
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # group 1
+        cls.group_default = Group.objects.create(name='default')        
+        cls.group_default.authgroup.description = 'Default Group'
+        cls.group_default.authgroup.internal = False
+        cls.group_default.authgroup.hidden = False
+        cls.group_default.authgroup.save()
+
+        # group 2
+        cls.group_internal = Group.objects.create(name='internal')
+        cls.group_internal.authgroup.description = 'Internal Group'
+        cls.group_internal.authgroup.internal = True        
+        cls.group_internal.authgroup.save()
+
+        # group 3
+        cls.group_hidden = Group.objects.create(name='hidden')
+        cls.group_hidden.authgroup.description = 'Hidden Group'
+        cls.group_hidden.authgroup.internal = False
+        cls.group_hidden.authgroup.hidden = True
+        cls.group_hidden.authgroup.save()
+
+        # group 4
+        cls.group_open = Group.objects.create(name='open')
+        cls.group_open.authgroup.description = 'Open Group'
+        cls.group_open.authgroup.internal = False
+        cls.group_open.authgroup.hidden = False
+        cls.group_open.authgroup.open = True
+        cls.group_open.authgroup.save()
+
+        # group 5
+        cls.group_public_1 = Group.objects.create(name='public 1')
+        cls.group_public_1.authgroup.description = 'Public Group 1'
+        cls.group_public_1.authgroup.internal = False
+        cls.group_public_1.authgroup.hidden = False
+        cls.group_public_1.authgroup.public = True
+        cls.group_public_1.authgroup.save()
+
+        # group 6
+        cls.group_public_2 = Group.objects.create(name='public 2')
+        cls.group_public_2.authgroup.description = 'Public Group 2'
+        cls.group_public_2.authgroup.internal = False
+        cls.group_public_2.authgroup.hidden = True
+        cls.group_public_2.authgroup.open = True
+        cls.group_public_2.authgroup.public = True
+        cls.group_public_2.authgroup.save()
+
+        # group 7
+        cls.group_default_member = Group.objects.create(name='default members')
+        cls.group_default_member.authgroup.description = \
+            'Default Group for members only'
+        cls.group_default_member.authgroup.internal = False
+        cls.group_default_member.authgroup.hidden = False
+        cls.group_default_member.authgroup.open = False
+        cls.group_default_member.authgroup.public = False
+        cls.group_default_member.authgroup.states.add(
+            AuthUtils.get_member_state()
+        )
+        cls.group_default_member.authgroup.save()
+    
+    def setUp(self):
+        self.user = AuthUtils.create_user('Bruce Wayne')
+
+    def test_get_joinable_group_member(self):        
+        result = GroupManager.get_joinable_groups(
+            AuthUtils.get_member_state()
+        )
+        expected = {
+            self.group_default, 
+            self.group_hidden, 
+            self.group_open, 
+            self.group_public_1, 
+            self.group_public_2,
+            self.group_default_member
+        }
+        self.assertSetEqual(set(result), expected)
+
+    def test_get_joinable_group_guest(self):
+        result = GroupManager.get_joinable_groups(
+            AuthUtils.get_guest_state()
+        )
+        expected = {
+            self.group_default, 
+            self.group_hidden, 
+            self.group_open, 
+            self.group_public_1, 
+            self.group_public_2
+        }
+        self.assertSetEqual(set(result), expected)
+
+    def test_joinable_group_member(self):
+        member_state = AuthUtils.get_member_state()
+        for x in [
+            self.group_default, 
+            self.group_hidden, 
+            self.group_open, 
+            self.group_public_1, 
+            self.group_public_2,
+            self.group_default_member
+        ]:
+            self.assertTrue(GroupManager.joinable_group(x, member_state))
+
+        for x in [
+            self.group_internal,             
+        ]:
+            self.assertFalse(GroupManager.joinable_group(x, member_state))
+
+
+    def test_joinable_group_guest(self):
+        guest_state = AuthUtils.get_guest_state()
+        for x in [
+            self.group_default, 
+            self.group_hidden, 
+            self.group_open, 
+            self.group_public_1, 
+            self.group_public_2
+        ]:
+            self.assertTrue(GroupManager.joinable_group(x, guest_state))
+
+        for x in [
+            self.group_internal,
+            self.group_default_member
+        ]:
+            self.assertFalse(GroupManager.joinable_group(x, guest_state))
+
+        
+    def test_get_all_non_internal_groups(self):
+        result = GroupManager.get_all_non_internal_groups()
+        expected = {
+            self.group_default, 
+            self.group_hidden, 
+            self.group_open, 
+            self.group_public_1, 
+            self.group_public_2, 
+            self.group_default_member
+        }
+        self.assertSetEqual(set(result), expected)
+
+    def test_check_internal_group(self):
+        self.assertTrue(
+            GroupManager.check_internal_group(self.group_default)
+        )
+        self.assertFalse(
+            GroupManager.check_internal_group(self.group_internal)
+        )
+
+    def test_get_joinable_groups_for_user_no_permission(self):
+        AuthUtils.assign_state(self.user, AuthUtils.get_guest_state())
+        result = GroupManager.get_joinable_groups_for_user(self.user)
+        expected= {self.group_public_1, self.group_public_2}
+        self.assertSetEqual(set(result), expected)
+
+    def test_get_joinable_groups_for_user_guest_w_permission_(self):
+        AuthUtils.assign_state(self.user, AuthUtils.get_guest_state())
+        AuthUtils.add_permission_to_user_by_name(
+            'groupmanagement.request_groups', self.user
+        )
+        result = GroupManager.get_joinable_groups_for_user(self.user)
+        expected = {
+            self.group_default, 
+            self.group_hidden, 
+            self.group_open, 
+            self.group_public_1, 
+            self.group_public_2
+        }
+        self.assertSetEqual(set(result), expected)
+
+    def test_get_joinable_groups_for_user_member_w_permission(self):
+        AuthUtils.assign_state(self.user, AuthUtils.get_member_state(), True)
+        AuthUtils.add_permission_to_user_by_name(
+            'groupmanagement.request_groups', self.user
+        )
+        result = GroupManager.get_joinable_groups_for_user(self.user)
+        expected = {
+            self.group_default,
+            self.group_hidden,
+            self.group_open,
+            self.group_public_1,
+            self.group_public_2,
+            self.group_default_member
+        }
+        self.assertSetEqual(set(result), expected)
+
+    def test_get_joinable_groups_for_user_member_w_permission_no_hidden(self):
+        AuthUtils.assign_state(self.user, AuthUtils.get_member_state(), True)
+        AuthUtils.add_permission_to_user_by_name(
+            'groupmanagement.request_groups', self.user
+        )
+        result = GroupManager.get_joinable_groups_for_user(
+            self.user, include_hidden=False
+        )
+        expected = {
+            self.group_default,
+            self.group_open, 
+            self.group_public_1,            
+            self.group_default_member
+        }
+        self.assertSetEqual(set(result), expected)
+
+    def test_has_management_permission(self):        
+        user = AuthUtils.create_user('Clark Kent')
+        AuthUtils.add_permission_to_user_by_name(
+            'auth.group_management', user
+        )        
+        self.assertTrue(GroupManager.has_management_permission(user))
+
+    def test_can_manage_groups_no_perm_no_group(self):        
+        user = AuthUtils.create_user('Clark Kent')
+        self.assertFalse(GroupManager.can_manage_groups(user))
+
+    def test_can_manage_groups_user_not_authenticated(self):        
+        user = MockUserNotAuthenticated()
+        self.assertFalse(GroupManager.can_manage_groups(user))
+
+    def test_can_manage_groups_has_perm(self):        
+        user = AuthUtils.create_user('Clark Kent')
+        AuthUtils.add_permission_to_user_by_name(
+            'auth.group_management', user
+        )        
+        self.assertTrue(GroupManager.can_manage_groups(user))
+
+    def test_can_manage_groups_no_perm_leads_group(self):        
+        user = AuthUtils.create_user('Clark Kent')
+        self.group_default.authgroup.group_leaders.add(user)
+        self.assertTrue(GroupManager.can_manage_groups(user))
+
+    def test_can_manage_group_no_perm_no_group(self):        
+        user = AuthUtils.create_user('Clark Kent')
+        self.assertFalse(
+            GroupManager.can_manage_group(user, self.group_default)
+        )
+
+    def test_can_manage_group_has_perm(self):        
+        user = AuthUtils.create_user('Clark Kent')
+        AuthUtils.add_permission_to_user_by_name(
+            'auth.group_management', user
+        )        
+        self.assertTrue(
+            GroupManager.can_manage_group(user, self.group_default)
+        )
+
+    def test_can_manage_group_no_perm_leads_correct_group(self):        
+        user = AuthUtils.create_user('Clark Kent')
+        self.group_default.authgroup.group_leaders.add(user)
+        self.assertTrue(
+            GroupManager.can_manage_group(user, self.group_default)
+        )
+
+    def test_can_manage_group_no_perm_leads_other_group(self):        
+        user = AuthUtils.create_user('Clark Kent')
+        self.group_hidden.authgroup.group_leaders.add(user)
+        self.assertFalse(
+            GroupManager.can_manage_group(user, self.group_default)
+        )
+
+    def test_can_manage_group_user_not_authenticated(self):        
+        user = MockUserNotAuthenticated()
+        self.assertFalse(
+            GroupManager.can_manage_group(user, self.group_default)
+        )

allianceauth/groupmanagement/tests/test_models.py

@@ -0,0 +1,167 @@
+from unittest import mock
+
+from django.contrib.auth.models import User, Group
+from django.test import TestCase
+
+from allianceauth.tests.auth_utils import AuthUtils
+from allianceauth.eveonline.models import (
+    EveCorporationInfo, EveAllianceInfo, EveCharacter
+)
+
+from ..models import GroupRequest, RequestLog
+
+
+def create_testdata():    
+    # clear DB
+    User.objects.all().delete()
+    Group.objects.all().delete()
+    EveCharacter.objects.all().delete()
+    EveCorporationInfo.objects.all().delete()
+    EveAllianceInfo.objects.all().delete()
+
+    # group 1
+    group = Group.objects.create(name='Superheros')        
+    group.authgroup.description = 'Default Group'
+    group.authgroup.internal = False
+    group.authgroup.hidden = False
+    group.authgroup.save()
+    
+    # user 1        
+    user_1 = AuthUtils.create_user('Bruce Wayne')
+    AuthUtils.add_main_character_2(
+        user_1,
+        name='Bruce Wayne',
+        character_id=1001,
+        corp_id=2001,
+        corp_name='Wayne Technologies'
+    )        
+    user_1.groups.add(group)
+    group.authgroup.group_leaders.add(user_1)
+
+    # user 2
+    user_2 = AuthUtils.create_user('Clark Kent')
+    AuthUtils.add_main_character_2(
+        user_2,
+        name='Clark Kent',
+        character_id=1002,
+        corp_id=2002,
+        corp_name='Wayne Technologies'
+    )            
+    return group, user_1, user_2
+
+
+
+class TestGroupRequest(TestCase):
+    
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.group, cls.user_1, _ = create_testdata()
+
+    def test_main_char(self):
+        group_request = GroupRequest.objects.create(
+            status='Pending',
+            user=self.user_1,
+            group=self.group
+        )
+        expected = self.user_1.profile.main_character
+        self.assertEqual(group_request.main_char, expected)
+
+    def test_str(self):
+        group_request = GroupRequest.objects.create(
+            status='Pending',
+            user=self.user_1,
+            group=self.group
+        )
+        expected = 'Bruce Wayne:Superheros'
+        self.assertEqual(str(group_request), expected)
+
+
+class TestRequestLog(TestCase):
+    
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.group, cls.user_1, cls.user_2 = create_testdata()
+
+    def test_requestor(self):
+        request_log = RequestLog.objects.create(
+            group=self.group,
+            request_info='Clark Kent:Superheros',
+            request_actor=self.user_1
+        )
+        expected = 'Clark Kent'
+        self.assertEqual(request_log.requestor(), expected)
+
+    def test_type_to_str_removed(self):
+        request_log = RequestLog.objects.create(
+            request_type=None,
+            group=self.group,
+            request_info='Clark Kent:Superheros',
+            request_actor=self.user_1
+        )
+        expected = 'Removed'
+        self.assertEqual(request_log.type_to_str(), expected)
+
+    def test_type_to_str_leave(self):
+        request_log = RequestLog.objects.create(
+            request_type=True,
+            group=self.group,
+            request_info='Clark Kent:Superheros',
+            request_actor=self.user_1
+        )
+        expected = 'Leave'
+        self.assertEqual(request_log.type_to_str(), expected)
+
+    def test_type_to_str_join(self):
+        request_log = RequestLog.objects.create(
+            request_type=False,
+            group=self.group,
+            request_info='Clark Kent:Superheros',
+            request_actor=self.user_1
+        )
+        expected = 'Join'
+        self.assertEqual(request_log.type_to_str(), expected)
+
+    def test_action_to_str_accept(self):
+        request_log = RequestLog.objects.create(            
+            group=self.group,
+            request_info='Clark Kent:Superheros',
+            request_actor=self.user_1,
+            action = True
+        )
+        expected = 'Accept'
+        self.assertEqual(request_log.action_to_str(), expected)
+
+    def test_action_to_str_reject(self):
+        request_log = RequestLog.objects.create(            
+            group=self.group,
+            request_info='Clark Kent:Superheros',
+            request_actor=self.user_1,
+            action = False
+        )
+        expected = 'Reject'
+        self.assertEqual(request_log.action_to_str(), expected)
+
+    def test_req_char(self):
+        request_log = RequestLog.objects.create(            
+            group=self.group,
+            request_info='Clark Kent:Superheros',
+            request_actor=self.user_1,
+            action = False
+        )
+        expected = self.user_2.profile.main_character
+        self.assertEqual(request_log.req_char(), expected)
+
+
+class TestAuthGroup(TestCase):
+
+    def test_str(self):
+        group = Group.objects.create(name='Superheros')        
+        group.authgroup.description = 'Default Group'
+        group.authgroup.internal = False
+        group.authgroup.hidden = False
+        group.authgroup.save()
+
+        expected = 'Superheros'
+        self.assertEqual(str(group.authgroup), expected)

allianceauth/groupmanagement/tests/test_signals.py

@@ -0,0 +1,61 @@
+from unittest import mock
+
+from django.test import TestCase
+from django.contrib.auth.models import User, Group
+
+from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo
+from allianceauth.tests.auth_utils import AuthUtils
+
+from ..signals import check_groups_on_state_change
+
+
+class GroupManagementStateTestCase(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        cls.user = AuthUtils.create_user('test')
+        AuthUtils.add_main_character(
+            cls.user, 'test character', '1', corp_id='2', corp_name='test_corp', corp_ticker='TEST', alliance_id='3', alliance_name='TEST'
+        )
+        cls.user.profile.refresh_from_db()
+        cls.alliance = EveAllianceInfo.objects.create(
+            alliance_id='3', alliance_name='test alliance', alliance_ticker='TEST', executor_corp_id='2'
+        )
+        cls.corp = EveCorporationInfo.objects.create(
+            corporation_id='2', corporation_name='test corp', corporation_ticker='TEST', alliance=cls.alliance, member_count=1
+        )
+        cls.state_group = Group.objects.create(name='state_group')
+        cls.open_group = Group.objects.create(name='open_group')
+        cls.state = AuthUtils.create_state('test state', 500)
+        cls.state_group.authgroup.states.add(cls.state)
+        cls.state_group.authgroup.internal = False
+        cls.state_group.save()
+
+    def setUp(self):
+        self.user.refresh_from_db()
+        self.state.refresh_from_db()
+
+    def _refresh_user(self):
+        self.user = User.objects.get(pk=self.user.pk)
+
+    def _refresh_test_group(self):
+        self.state_group = Group.objects.get(pk=self.state_group.pk)
+
+    def test_drop_state_group(self):
+        self.user.groups.add(self.open_group)
+        self.user.groups.add(self.state_group)     
+        self.assertEqual(self.user.profile.state.name, "Guest")
+
+        self.state.member_corporations.add(self.corp)
+        self._refresh_user()
+        self.assertEqual(self.user.profile.state, self.state)
+        groups = self.user.groups.all()
+        self.assertIn(self.state_group, groups) #keeps group
+        self.assertIn(self.open_group, groups) #public group unafected
+
+        self.state.member_corporations.clear()
+        self._refresh_user()
+        self.assertEqual(self.user.profile.state.name, "Guest")
+        groups = self.user.groups.all()
+        self.assertNotIn(self.state_group, groups) #looses group
+        self.assertIn(self.open_group, groups) #public group unafected

allianceauth/groupmanagement/tests/test_views.py

@@ -0,0 +1,22 @@
+from unittest.mock import Mock, patch
+
+from django.test import RequestFactory, TestCase
+from django.urls import reverse
+
+from allianceauth.tests.auth_utils import AuthUtils
+from esi.models import Token
+
+from .. import views
+
+
+class TestViews(TestCase):
+        
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.user = AuthUtils.create_user('Bruce Wayne')        
+
+    def test_groups_view_can_load(self):
+        request = self.factory.get(reverse('groupmanagement:groups'))
+        request.user = self.user
+        response = views.groups_view(request)
+        self.assertEqual(response.status_code, 200)        

allianceauth/groupmanagement/views.py

@@ -1,5 +1,6 @@
 import logging
 
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import user_passes_test
@@ -10,12 +11,12 @@ from django.db.models import Count
 from django.http import Http404
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.translation import ugettext_lazy as _
-from .managers import GroupManager
-from .models import GroupRequest, RequestLog
 
 from allianceauth.notifications import notify
 
-from django.conf import settings
+from .managers import GroupManager
+from .models import GroupRequest, RequestLog
+
 
 logger = logging.getLogger(__name__)
 
@@ -33,7 +34,8 @@ def group_management(request):
         group_requests = base_group_query.all()
     else:
         # Group specific leader
-        group_requests = base_group_query.filter(group__authgroup__group_leaders__in=[request.user])
+        users__groups = GroupManager.get_group_leaders_groups(request.user)
+        group_requests = base_group_query.filter(group__in=users__groups)
 
     for grouprequest in group_requests:
         if grouprequest.leave_request:
@@ -234,7 +236,7 @@ def group_reject_request(request, group_request_id):
         raise p
     except:
         messages.error(request, _('An unhandled error occurred while processing the application from %(mainchar)s to %(group)s.') % {"mainchar": group_request.main_char, "group": group_request.group})
-        logger.exception("Unhandled exception occured while user %s attempting to reject group request id %s" % (
+        logger.exception("Unhandled exception occurred while user %s attempting to reject group request id %s" % (
             request.user, group_request_id))
         pass
 
@@ -268,9 +270,9 @@ def group_leave_accept_request(request, group_request_id):
                        (request.user, group_request_id))
         raise p
     except:
-        messages.error(request, _('An unhandled error occured while processing the application from %(mainchar)s to leave %(group)s.') % {
+        messages.error(request, _('An unhandled error occurred while processing the application from %(mainchar)s to leave %(group)s.') % {
             "mainchar": group_request.main_char, "group": group_request.group})
-        logger.exception("Unhandled exception occured while user %s attempting to accept group leave request id %s" % (
+        logger.exception("Unhandled exception occurred while user %s attempting to accept group leave request id %s" % (
             request.user, group_request_id))
         pass
 
@@ -302,9 +304,9 @@ def group_leave_reject_request(request, group_request_id):
                        (request.user, group_request_id))
         raise p
     except:
-        messages.error(request, _('An unhandled error occured while processing the application from %(mainchar)s to leave %(group)s.') % {
+        messages.error(request, _('An unhandled error occurred while processing the application from %(mainchar)s to leave %(group)s.') % {
             "mainchar": group_request.main_char, "group": group_request.group})
-        logger.exception("Unhandled exception occured while user %s attempting to reject group leave request id %s" % (
+        logger.exception("Unhandled exception occurred while user %s attempting to reject group leave request id %s" % (
             request.user, group_request_id))
         pass
 
@@ -314,24 +316,23 @@ def group_leave_reject_request(request, group_request_id):
 @login_required
 def groups_view(request):
     logger.debug("groups_view called by user %s" % request.user)
+    
+    groups_qs = GroupManager.get_joinable_groups_for_user(
+        request.user, include_hidden=False
+    )
+    groups_qs = groups_qs.order_by('name')
     groups = []
+    for group in groups_qs:        
+        group_request = GroupRequest.objects\
+            .filter(user=request.user)\
+            .filter(group=group)
+        groups.append({
+            'group': group, 
+            'request': group_request[0] if group_request else None
+        })
 
-    group_query = GroupManager.get_joinable_groups(request.user.profile.state)
-
-    if not request.user.has_perm('groupmanagement.request_groups'):
-        # Filter down to public groups only for non-members
-        group_query = group_query.filter(authgroup__public=True)
-        logger.debug("Not a member, only public groups will be available")
-
-    for group in group_query:
-        # Exclude hidden
-        if not group.authgroup.hidden:
-            group_request = GroupRequest.objects.filter(user=request.user).filter(group=group)
-
-            groups.append({'group': group, 'request': group_request[0] if group_request else None})
-
-    render_items = {'groups': groups}
-    return render(request, 'groupmanagement/groups.html', context=render_items)
+    context = {'groups': groups}
+    return render(request, 'groupmanagement/groups.html', context=context)
 
 
 @login_required
@@ -348,13 +349,13 @@ def group_request_add(request, group_id):
         # User is already a member of this group.
         logger.warning("User %s attempted to join group id %s but they are already a member." %
                        (request.user, group_id))
-        messages.warning(request, "You are already a member of that group.")
+        messages.warning(request, _("You are already a member of that group."))
         return redirect('groupmanagement:groups')
     if not request.user.has_perm('groupmanagement.request_groups') and not group.authgroup.public:
         # Does not have the required permission, trying to join a non-public group
         logger.warning("User %s attempted to join group id %s but it is not a public group" %
                        (request.user, group_id))
-        messages.warning(request, "You cannot join that group")
+        messages.warning(request, _("You cannot join that group"))
         return redirect('groupmanagement:groups')
     if group.authgroup.open:
         logger.info("%s joining %s as is an open group" % (request.user, group))
@@ -363,7 +364,7 @@ def group_request_add(request, group_id):
     req = GroupRequest.objects.filter(user=request.user, group=group)
     if len(req) > 0:
         logger.info("%s attempted to join %s but already has an open application" % (request.user, group))
-        messages.warning(request, "You already have a pending application for that group.")
+        messages.warning(request, _("You already have a pending application for that group."))
         return redirect("groupmanagement:groups")
     grouprequest = GroupRequest()
     grouprequest.status = _('Pending')
@@ -397,7 +398,7 @@ def group_request_leave(request, group_id):
     req = GroupRequest.objects.filter(user=request.user, group=group)
     if len(req) > 0:
         logger.info("%s attempted to leave %s but already has an pending leave request." % (request.user, group))
-        messages.warning(request, "You already have a pending leave request for that group.")
+        messages.warning(request, _("You already have a pending leave request for that group."))
         return redirect("groupmanagement:groups")
     if getattr(settings, 'AUTO_LEAVE', False):
         logger.info("%s leaving joinable group %s due to auto_leave" % (request.user, group))

allianceauth/optimer/templates/optimer/fleetoptable.html

@@ -2,44 +2,46 @@
 {% load evelinks %}
 
 {% block content %}
-     <table class="table">
-        <thead>
-            <tr>
-                <th class="text-center col-lg-3">{% trans "Operation Name" %}</th>
-                <th class="text-center col lg-2">{% trans "Doctrine" %}</th>
-                <th class="text-center col-lg-1">{% trans "Form Up System" %}</th>
-                <th class="text-center col-lg-1">{% trans "Start Time" %}</th>
-                <th class="text-center col-lg-1">{% trans "Local Time" %}</th>
-                <th class="text-center col-lg-1">{% trans "Duration" %}</th>
-                <th class="text-center col-lg-1">{% trans "FC" %}</th>
-                {% if perms.auth.optimer_management %}
-                <th class="text-center col-lg-1">{% trans "Creator" %}</th>
-                <th class="text-center col-lg-2">{% trans "Action" %}</th>
-                {% endif %}
-            </tr>
-        </thead>
-     {% for ops in timers %}
-         <tbody>
-            <tr>
-                <td class="text-center">{{ ops.operation_name }}</td>
-                <td class="text-center">{{ ops.doctrine }}</td>
-                <td class="text-center">
-                    <a href="{{ ops.system|dotlan_solar_system_url }}">{{ ops.system }}</a>
-                </td>
-                <td class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
-                <td class="text-center" nowrap><div id="localtime{{ ops.id }}"></div><div id="countdown{{ ops.id }}"></div></td>
-                <td class="text-center">{{ ops.duration }}</td>
-                <td class="text-center">{{ ops.fc }}</td>
-                {% if perms.auth.optimer_management %}
-                    <td class="text-center">{{ ops.eve_character }}</td>
-                    <td class="text-center">
-                        <a href="{% url 'optimer:remove' ops.id %}" class="btn btn-danger">
-                        <span class="glyphicon glyphicon-remove"></span>
-                    </a><a href="{% url 'optimer:edit' ops.id %}" class="btn btn-info"><span class="glyphicon glyphicon-pencil"></span></a>
-                    </td>
-                {% endif %}
-            </tr>
-        </tbody>
-    {% endfor %}
-    </table>
+     <div class="table-responsive">
+        <table class="table">
+            <thead>
+                <tr>
+                    <th class="text-center col-lg-3">{% trans "Operation Name" %}</th>
+                    <th class="text-center col lg-2">{% trans "Doctrine" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Form Up System" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Start Time" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Local Time" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Duration" %}</th>
+                    <th class="text-center col-lg-1">{% trans "FC" %}</th>
+                    {% if perms.auth.optimer_management %}
+                    <th class="text-center col-lg-1">{% trans "Creator" %}</th>
+                    <th class="text-center col-lg-2">{% trans "Action" %}</th>
+                    {% endif %}
+                </tr>
+            </thead>
+            {% for ops in timers %}
+                <tbody>
+                    <tr>
+                        <td class="text-center">{{ ops.operation_name }}</td>
+                        <td class="text-center">{{ ops.doctrine }}</td>
+                        <td class="text-center">
+                            <a href="{{ ops.system|dotlan_solar_system_url }}">{{ ops.system }}</a>
+                        </td>
+                        <td class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
+                        <td class="text-center" nowrap><div id="localtime{{ ops.id }}"></div><div id="countdown{{ ops.id }}"></div></td>
+                        <td class="text-center">{{ ops.duration }}</td>
+                        <td class="text-center">{{ ops.fc }}</td>
+                        {% if perms.auth.optimer_management %}
+                            <td class="text-center">{{ ops.eve_character }}</td>
+                            <td class="text-center">
+                                <a href="{% url 'optimer:remove' ops.id %}" class="btn btn-danger">
+                                <span class="glyphicon glyphicon-remove"></span>
+                            </a><a href="{% url 'optimer:edit' ops.id %}" class="btn btn-info"><span class="glyphicon glyphicon-pencil"></span></a>
+                            </td>
+                        {% endif %}
+                    </tr>
+                </tbody>
+            {% endfor %}
+        </table>
+    </div>
 {% endblock content %}

allianceauth/permissions_tool/templates/permissions_tool/audit.html

@@ -8,41 +8,85 @@
 {% block content %}
     <div>
         <h1 class="page-header">{% trans "Permissions Audit" %}: {{ permission.permission.codename }}</h1>
-        <a href="{% url 'permissions_tool:overview' %}" class="btn btn-default">
-            <i class="glyphicon glyphicon-chevron-left"></i> {% trans "Back" %}
-        </a>
-        <table class="table table-hover">
-            <thead>
-                <tr>
-                    <th class="col-md-3">
-                        {% trans "Group" %}
-                    </th>
-                    <th class="col-md-3">
-                        {% trans "User" %}
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-            {% for user in permission.users %}
-                <tr>
-                    {% include 'permissions_tool/audit_row.html' with group="Permission Granted Directly (No Group)" %}
-                </tr>
-            {% endfor %}
-            {% for group in permission.groups %}
-                {% for user in group.user_set.all %}
-                    {% include 'permissions_tool/audit_row.html' %}
+        <p>
+            <a href="{% url 'permissions_tool:overview' %}" class="btn btn-default">
+                <i class="glyphicon glyphicon-chevron-left"></i> {% trans "Back" %}
+            </a>
+        </p>
+        <div class="table-responsive">
+            <table class="table table-striped" id="tab_permissions_audit">
+                <thead>
+                    <tr>
+                        <th>{% trans "Group" %}</th>
+                        <th></th>
+                        <th>{% trans "User / Character" %}</th>
+                        <th>{% trans "Organization" %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                {% for user in permission.users %}                    
+                    {% include 'permissions_tool/audit_row.html' with type="User" name="Permission granted directlty" %}
                 {% endfor %}
-            {% endfor %}
-            {% for state in permission.states %}
-                {% for profile in state.userprofile_set.all %}
-                    {% with profile.user as user %}
-                        <tr>
-                            {% include 'permissions_tool/audit_state_row.html' %}
-                        </tr>
-                    {% endwith %}
+                {% for group in permission.groups %}
+                    {% for user in group.user_set.all %}
+                        {% include 'permissions_tool/audit_row.html' with type="Group" name=group%}
+                    {% endfor %}
                 {% endfor %}
-            {% endfor %}
-            </tbody>
-        </table>
+                {% for state in permission.states %}
+                    {% for profile in state.userprofile_set.all %}
+                        {% with profile.user as user %}
+                            {% include 'permissions_tool/audit_row.html' with type="State" name=state%}                            
+                        {% endwith %}
+                    {% endfor %}
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>        
     </div>
 {% endblock content %}
+
+{% block extra_javascript %}
+    {% include 'bundles/datatables-js.html' %}
+    <script type="text/javascript" src="{% static 'js/filterDropDown/filterDropDown.min.js' %}"></script>
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css.html' %}
+{% endblock %}
+
+{% block extra_script %}
+    $(document).ready(function() {
+        var groupColumn = 0;
+        var table = $('#tab_permissions_audit').DataTable({
+            columnDefs: [
+                { "visible": false, "targets": groupColumn }
+            ],
+            order: [[ groupColumn, 'asc' ], [ 2, 'asc' ] ],
+            filterDropDown:
+            {
+                columns: [                                       
+                    {
+                        idx: 0,
+                        title: 'Source'
+                    }
+                ],
+                bootstrap: true
+            },
+            drawCallback: function ( settings ) {
+                var api = this.api();
+                var rows = api.rows( {page:'current'} ).nodes();
+                var last=null;
+    
+                api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) {
+                    if ( last !== group ) {
+                        $(rows).eq( i ).before(
+                            '<tr class="tr-group"><td colspan="3">' + group + '</td></tr>'
+                        );
+    
+                        last = group;
+                    }
+                } );
+            }
+        } );
+    } );
+{% endblock %}

allianceauth/permissions_tool/templates/permissions_tool/audit_row.html

@@ -1,10 +1,25 @@
+{% load evelinks %}
+
 <tr>
-    <td>
-        {% if forloop.first %}
-            <b>{{ group }}</b>
-        {% endif %}
+    <td>        
+        {{ type }}: {{ name }}
+    </td>
+    <td class="text-right">
+        <img src="{{ user.profile.main_character|character_portrait_url:32 }}" class="img-circle">
     </td>
     <td>
-        {{ user }}
+        <strong>{{ user }}<br></strong>
+        {{ user.profile.main_character.character_name }}
+    </td>
+    <td class="text-left">
+        {% if user.profile.main_character %}
+            <a href="{{ user.profile.main_character|dotlan_corporation_url }}" target="_blank">
+                {{ user.profile.main_character.corporation_name }}
+            </a><br>
+            {{ user.profile.main_character.alliance_name|default_if_none:"" }}
+        {% else %}
+            (unknown)
+        {% endif %}
+        
     </td>
 </tr>

allianceauth/permissions_tool/templates/permissions_tool/audit_state_row.html

@@ -1,11 +0,0 @@
-{% load i18n %}
-<tr>
-    <td>
-        {% if forloop.first %}
-            <b>{% trans 'State' %}: {{ state }}</b>
-        {% endif %}
-    </td>
-    <td>
-        {{ user }}
-    </td>
-</tr>

allianceauth/permissions_tool/templates/permissions_tool/overview.html

@@ -8,72 +8,120 @@
 {% block content %}
     <div class="col-sm-12">
         <h1 class="page-header">{% trans "Permissions Overview" %}</h1>
-        {% if request.GET.all != 'yes' %}
-            <span class="pull-right">
-                {% blocktrans %}Showing only applied permissions{% endblocktrans %}
-                <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% trans "Show All" %}</a>
-            </span>
+        <p>
+        {% if request.GET.all != 'yes' %}            
+            {% blocktrans %}Showing only applied permissions{% endblocktrans %}
+            <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% trans "Show All" %}</a>            
         {% else %}
-            <span class="pull-right">
-                {% blocktrans %}Showing all permissions{% endblocktrans %}
-                <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% trans "Show Applied" %}</a>
-            </span>
+            {% blocktrans %}Showing all permissions{% endblocktrans %}
+            <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% trans "Show Applied" %}</a>
         {% endif %}
-        <table class="table table-hover">
-            <thead>
-                <tr>
-                    <th>
-                        {% trans "App" %}
-                    </th>
-                    <th>
-                        {% trans "Model" %}
-                    </th>
-                    <th>
-                        {% trans "Code Name" %}
-                    </th>
-                    <th>
-                        {% trans "Name" %}
-                    </th>
-                    <th class="col-md-1">
-                        {% trans "Users" %}
-                    </th>
-                    <th class="col-md-1">
-                        {% trans "Groups" %}
-                    </th>
-                    <th class="col-md-1">
-                        {% trans "States" %}
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-            {% for perm in permissions %}
-                <tr>
-                    <td>
-                        {{ perm.permission.content_type.app_label }}
-                    </td>
-                    <td>
-                        {{ perm.permission.content_type.model }}
-                    </td>
-                    <td>
-                        <a href="{% url "permissions_tool:audit" app_label=perm.permission.content_type.app_label model=perm.permission.content_type.model codename=perm.permission.codename %}">
-                            {{ perm.permission.codename }}
-                        </a>
-                    </td>
-                    <td>
-                        {{ perm.permission.name }}
-                    </td>
-                    <td class="{% if perm.users > 0 %}info {% endif %}text-right">
-                        {{ perm.users }}
-                    </td>
-                    <td class="{% if perm.groups > 0 %}info {% endif %}text-right">
-                        {{ perm.groups }} ({{ perm.group_users }})
-                    </td>
-                    <td class="{% if perm.states > 0 %}info {% endif %}text-right">
-                        {{ perm.states }} ({{ perm.state_users }})
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
+        </p>
+        <div class="table-responsive">
+            <table class="table table-striped" id="tab_permissions_overview" style="width:100%">
+                <thead>
+                    <tr>
+                        <th>
+                            {% trans "App" %}
+                        </th>
+                        <th>
+                            {% trans "Model" %}
+                        </th>
+                        <th>
+                            {% trans "Code Name" %}
+                        </th>
+                        <th>
+                            {% trans "Name" %}
+                        </th>
+                        <th class="col-md-1">
+                            {% trans "Users" %}
+                        </th>
+                        <th class="col-md-1">
+                            {% trans "Groups" %}
+                        </th>
+                        <th class="col-md-1">
+                            {% trans "States" %}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                {% for perm in permissions %}
+                    <tr>
+                        <td>
+                            {{ perm.permission.content_type.app_label }}
+                        </td>
+                        <td>
+                            {{ perm.permission.content_type.model }}
+                        </td>
+                        <td>
+                            <a href="{% url "permissions_tool:audit" app_label=perm.permission.content_type.app_label model=perm.permission.content_type.model codename=perm.permission.codename %}">
+                                {{ perm.permission.codename }}
+                            </a>
+                        </td>
+                        <td>
+                            {{ perm.permission.name }}
+                        </td>
+                        <td class="{% if perm.users > 0 %}info {% endif %}text-right">
+                            {{ perm.users }}
+                        </td>
+                        <td class="{% if perm.groups > 0 %}info {% endif %}text-right">
+                            {{ perm.groups }} ({{ perm.group_users }})
+                        </td>
+                        <td class="{% if perm.states > 0 %}info {% endif %}text-right">
+                            {{ perm.states }} ({{ perm.state_users }})
+                        </td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
     </div>
 {% endblock content %}
+
+{% block extra_javascript %}
+    {% include 'bundles/datatables-js.html' %}    
+    <script type="text/javascript" src="{% static 'js/filterDropDown/filterDropDown.min.js' %}"></script>
+{% endblock %}
+
+{% block extra_css %}
+    {% include 'bundles/datatables-css.html' %}
+{% endblock %}
+
+{% block extra_script %}
+    $(document).ready(function() {
+        var groupColumn = 0;
+        var table = $('#tab_permissions_overview').DataTable({
+            columnDefs: [
+                { "visible": false, "targets": groupColumn }
+            ],
+            order: [[ groupColumn, 'asc' ], [ 1, 'asc' ], [ 2, 'asc' ] ],
+            filterDropDown:
+            {
+                columns: [                                       
+                    {
+                        idx: 0
+                    },
+                    {
+                        idx: 1
+                    }
+                ],
+                bootstrap: true
+            },
+            drawCallback: function ( settings ) {
+                var api = this.api();
+                var rows = api.rows( {page:'current'} ).nodes();
+                var last=null;
+    
+                api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) {
+                    if ( last !== group ) {
+                        $(rows).eq( i ).before(
+                            '<tr class="tr-group"><td colspan="6">' + group + '</td></tr>'
+                        );
+    
+                        last = group;
+                    }
+                } );
+            }
+        } );
+    } );
+{% endblock %}

allianceauth/project_template/project_name/celery.py

@@ -11,6 +11,15 @@ app = Celery('{{ project_name }}')
 # Using a string here means the worker don't have to serialize
 # the configuration object to child processes.
 app.config_from_object('django.conf:settings')
+
+# setup priorities ( 0 Highest, 9 Lowest )
+app.conf.broker_transport_options = {
+    'priority_steps': list(range(10)),  # setup que to have 10 steps
+    'queue_order_strategy': 'priority',  # setup que to use prio sorting
+}
+app.conf.task_default_priority = 5  # anything called with the task.delay() will be given normal priority (5)
+app.conf.worker_prefetch_multiplier = 1  # only prefetch single tasks at a time on the workers so that prio tasks happen
+
 app.conf.ONCE = {
     'backend': 'allianceauth.services.tasks.DjangoBackend',
     'settings': {}

allianceauth/project_template/project_name/settings/base.py

@@ -83,6 +83,9 @@ LANGUAGES = (
     ('en', ugettext('English')),
     ('de', ugettext('German')),
     ('es', ugettext('Spanish')),
+    ('zh-hans', ugettext('Chinese Simplified')),
+    ('ru', ugettext('Russian')),
+    ('ko', ugettext('Korean')),
 )
 
 TEMPLATES = [
@@ -217,6 +220,14 @@ LOGGING = {
             'maxBytes': 1024 * 1024 * 5,  # edit this line to change max log file size
             'backupCount': 5,  # edit this line to change number of log backups
         },
+        'extension_file': {
+            'level': 'DEBUG',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': os.path.join(BASE_DIR, 'log/extensions.log'),
+            'formatter': 'verbose',
+            'maxBytes': 1024 * 1024 * 5,  # edit this line to change max log file size
+            'backupCount': 5,  # edit this line to change number of log backups
+        },
         'console': {
             'level': 'DEBUG',  # edit this line to change logging level to console
             'class': 'logging.StreamHandler',
@@ -233,6 +244,10 @@ LOGGING = {
             'handlers': ['log_file', 'console', 'notifications'],
             'level': 'DEBUG',
         },
+        'extensions': {
+            'handlers': ['extension_file', 'console'],
+            'level': 'DEBUG',
+        },
         'django': {
             'handlers': ['log_file', 'console'],
             'level': 'ERROR',

allianceauth/services/abstract.py

@@ -17,6 +17,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMix
 from django.db import models, IntegrityError
 from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import render, Http404, redirect
+from django.utils.translation import gettext_lazy as _
 
 from .forms import ServicePasswordModelForm
 
@@ -68,7 +69,7 @@ class BaseCreatePasswordServiceAccountView(BaseServiceView, ServiceCredentialsVi
         try:
             svc_obj = self.model.objects.create(user=request.user)
         except IntegrityError:
-            messages.error(request, "That service account already exists")
+            messages.error(request, _("That service account already exists"))
             return redirect(self.index_redirect)
 
         return render(request, self.template_name,
@@ -100,7 +101,7 @@ class BaseSetPasswordServiceAccountView(ServicesCRUDMixin, BaseServiceView, Upda
     def post(self, request, *args, **kwargs):
         result = super(BaseSetPasswordServiceAccountView, self).post(request, *args, **kwargs)
         if self.get_form().is_valid():
-            messages.success(request, "Successfully set your {} password".format(self.service_name))
+            messages.success(request, _("Successfully set your {} password".format(self.service_name)))
         return result
 
 

allianceauth/services/admin.py

@@ -1,9 +1,47 @@
-from django.contrib import admin
 from django import forms
+from django.contrib import admin
+from django.db.models.functions import Lower
+from django.urls import reverse
+from django.utils.html import format_html
+
 from allianceauth import hooks
+from allianceauth.eveonline.models import EveCharacter
+from allianceauth.authentication.admin import user_profile_pic, \
+    user_username, user_main_organization, MainCorporationsFilter,\
+    MainAllianceFilter
+
 from .models import NameFormatConfig
 
 
+class ServicesUserAdmin(admin.ModelAdmin):
+    """Parent class for UserAdmin classes for all services"""
+    class Media:
+        css = {
+            "all": ("services/admin.css",)
+        }
+
+    search_fields = ('user__username',)
+    ordering = ('user__username',)
+    list_select_related = True              
+    list_display = (
+        user_profile_pic,
+        user_username,  
+        user_main_organization, 
+        '_date_joined'
+    )
+    list_filter = (        
+        MainCorporationsFilter,        
+        MainAllianceFilter,
+        'user__date_joined'
+    )
+
+    def _date_joined(self, obj):
+        return obj.user.date_joined
+    
+    _date_joined.short_description = 'date joined'
+    _date_joined.admin_order_field = 'user__date_joined'
+
+
 class NameFormatConfigForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(NameFormatConfigForm, self).__init__(*args, **kwargs)

allianceauth/services/auth_hooks.py

@@ -1,4 +1,6 @@
+from django.utils.translation import gettext_lazy as _
 from allianceauth import hooks
+
 from .hooks import MenuItemHook
 from .hooks import ServicesHook
 
@@ -6,7 +8,7 @@ from .hooks import ServicesHook
 class Services(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
-                              'Services',
+                              _('Services'),
                               'fa fa-cogs fa-fw',
                               'services:services', 100)
 

allianceauth/services/hooks.py

@@ -9,6 +9,29 @@ from allianceauth.hooks import get_hooks
 from .models import NameFormatConfig
 
 
+def get_extension_logger(name):
+    """
+    Takes the name of a plugin/extension and generates a child logger of the extensions logger
+    to be used by the extension to log events to the extensions logger.
+
+    The logging level is decided by whether or not DEBUG is set to true in the project settings. If
+    DEBUG is set to false, then the logging level is set to INFO.
+
+    :param: name: the name of the extension doing the logging
+    :return: an extensions child logger
+    """
+    import logging
+    from django.conf import settings
+
+    logger = logging.getLogger('extensions.' + name)
+    logger.name = name
+    logger.level = logging.INFO
+    if settings.DEBUG:
+        logger.level = logging.DEBUG
+
+    return logger
+
+
 class ServicesHook:
     """
     Abstract base class for creating a compatible services

allianceauth/services/migrations/0001_initial.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.1 on 2016-09-05 21:40
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('auth', '0008_alter_user_username_max_length'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DiscordAuthToken',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('email', models.CharField(max_length=254, unique=True)),
-                ('token', models.CharField(max_length=254)),
-                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='GroupCache',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created', models.DateTimeField(auto_now_add=True)),
-                ('groups', models.TextField(default={})),
-                ('service', models.CharField(choices=[(b'discourse', b'discourse'), (b'discord', b'discord')], max_length=254, unique=True)),
-            ],
-        ),
-    ]

allianceauth/services/migrations/0002_auto_20161016_0135.py

@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.1 on 2016-10-16 01:35
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('services', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='discordauthtoken',
-            name='user',
-        ),
-        migrations.DeleteModel(
-            name='DiscordAuthToken',
-        ),
-    ]

allianceauth/services/migrations/0003_delete_groupcache.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-09-02 06:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('services', '0002_auto_20161016_0135'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='GroupCache',
-        ),
-    ]

allianceauth/services/migrations/0003_remove_broken_link.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.10 on 2020-03-21 13:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('services', '0002_nameformatter'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='nameformatconfig',
+            name='format',
+            field=models.CharField(help_text='For information on constructing name formats please see the official documentation, topic "Services Name Formats".', max_length=100),
+        ),
+    ]

allianceauth/services/models.py

@@ -4,14 +4,30 @@ from allianceauth.authentication.models import State
 
 
 class NameFormatConfig(models.Model):
-    service_name = models.CharField(max_length=100, blank=False, null=False)
-    default_to_username = models.BooleanField(default=True, help_text="If a user has no main_character, "
-                                                                      "default to using their Auth username instead.")
-    format = models.CharField(max_length=100, blank=False, null=False,
-                              help_text='For information on constructing name formats, please see the '
-                                        '<a href="https://allianceauth.readthedocs.io/en/latest/features/nameformats">'
-                                        'name format documentation</a>')
-    states = models.ManyToManyField(State, help_text="States to apply this format to. You should only have one "
-                                                     "formatter for each state for each service.")
+    service_name = models.CharField(max_length=100, blank=False)
+    default_to_username = models.BooleanField(
+        default=True, 
+        help_text=
+            'If a user has no main_character, '
+            'default to using their Auth username instead.'
+    )
+    format = models.CharField(
+        max_length=100,
+        blank=False,
+        help_text=
+            'For information on constructing name formats '
+            'please see the official documentation, '
+            'topic "Services Name Formats".'
+    )
+    states = models.ManyToManyField(
+        State, 
+        help_text=
+            "States to apply this format to. You should only have one "
+            "formatter for each state for each service."        
+    )
 
+    def __str__(self):
+        return '%s: %s' % (
+            self.service_name, ', '.join([str(x) for x in self.states.all()])
+        )
 

allianceauth/services/modules/discord/admin.py

@@ -1,9 +1,17 @@
 from django.contrib import admin
+
 from .models import DiscordUser
+from ...admin import ServicesUserAdmin
 
 
-class DiscordUserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'uid')
-        search_fields = ('user__username', 'uid')
+@admin.register(DiscordUser)
+class DiscordUserAdmin(ServicesUserAdmin):            
+    list_display = ServicesUserAdmin.list_display + ('_uid',)
+    search_fields = ServicesUserAdmin.search_fields + ('uid', )
+   
+    def _uid(self, obj):
+        return obj.uid
+    
+    _uid.short_description = 'Discord ID (UID)'
+    _uid.admin_order_field = 'uid'
 
-admin.site.register(DiscordUser, DiscordUserAdmin)

allianceauth/services/modules/discord/tests/__init__.py

@@ -0,0 +1,10 @@
+from django.contrib.auth.models import User, Group, Permission
+from allianceauth.tests.auth_utils import AuthUtils
+
+DEFAULT_AUTH_GROUP = 'Member'
+MODULE_PATH = 'allianceauth.services.modules.discord'
+
+def add_permissions():
+    permission = Permission.objects.get(codename='access_discord')
+    members = Group.objects.get_or_create(name=DEFAULT_AUTH_GROUP)[0]
+    AuthUtils.add_permissions_to_groups([permission], [members])

allianceauth/services/modules/discord/tests/test_admin.py

@@ -0,0 +1,268 @@
+from unittest.mock import patch
+
+from django.test import TestCase, RequestFactory
+from django.contrib import admin
+from django.contrib.admin.sites import AdminSite
+from django.contrib.auth.models import User
+
+from allianceauth.authentication.models import CharacterOwnership
+from allianceauth.eveonline.models import (
+    EveCharacter, EveCorporationInfo, EveAllianceInfo
+)
+
+from ....admin import (
+    user_profile_pic, 
+    user_username, 
+    user_main_organization, 
+    ServicesUserAdmin,
+    MainCorporationsFilter,
+    MainAllianceFilter
+)
+from ..admin import (        
+    DiscordUser,
+    DiscordUserAdmin    
+)
+
+
+class TestDiscordUserAdmin(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        
+        # user 1 - corp and alliance, normal user
+        cls.character_1 = EveCharacter.objects.create(
+            character_id='1001',
+            character_name='Bruce Wayne',
+            corporation_id='2001',
+            corporation_name='Wayne Technologies',
+            corporation_ticker='WT',
+            alliance_id='3001',
+            alliance_name='Wayne Enterprises',
+            alliance_ticker='WE',
+        )
+        cls.character_1a = EveCharacter.objects.create(
+            character_id='1002',
+            character_name='Batman',
+            corporation_id='2001',
+            corporation_name='Wayne Technologies',
+            corporation_ticker='WT',
+            alliance_id='3001',
+            alliance_name='Wayne Enterprises',
+            alliance_ticker='WE',
+        )
+        alliance = EveAllianceInfo.objects.create(
+            alliance_id='3001',
+            alliance_name='Wayne Enterprises',
+            alliance_ticker='WE',            
+            executor_corp_id='2001'
+        )
+        EveCorporationInfo.objects.create(
+            corporation_id='2001',
+            corporation_name='Wayne Technologies',
+            corporation_ticker='WT',            
+            member_count=42,
+            alliance=alliance
+        )        
+        cls.user_1 = User.objects.create_user(
+            cls.character_1.character_name.replace(' ', '_'),
+            'abc@example.com',
+            'password'
+        )
+        CharacterOwnership.objects.create(
+            character=cls.character_1,
+            owner_hash='x1' + cls.character_1.character_name,
+            user=cls.user_1
+        )
+        CharacterOwnership.objects.create(
+            character=cls.character_1a,
+            owner_hash='x1' + cls.character_1a.character_name,
+            user=cls.user_1
+        )
+        cls.user_1.profile.main_character = cls.character_1
+        cls.user_1.profile.save()
+        DiscordUser.objects.create(
+            user=cls.user_1,
+            uid=1001
+        )
+
+        # user 2 - corp only, staff
+        cls.character_2 = EveCharacter.objects.create(
+            character_id=1003,
+            character_name='Clark Kent',
+            corporation_id=2002,
+            corporation_name='Daily Planet',
+            corporation_ticker='DP',
+            alliance_id=None
+        )
+        EveCorporationInfo.objects.create(
+            corporation_id=2002,
+            corporation_name='Daily Plane',
+            corporation_ticker='DP',            
+            member_count=99,
+            alliance=None
+        )
+        cls.user_2 = User.objects.create_user(
+            cls.character_2.character_name.replace(' ', '_'),
+            'abc@example.com',
+            'password'
+        )
+        CharacterOwnership.objects.create(
+            character=cls.character_2,
+            owner_hash='x1' + cls.character_2.character_name,
+            user=cls.user_2
+        )
+        cls.user_2.profile.main_character = cls.character_2
+        cls.user_2.profile.save()
+        DiscordUser.objects.create(
+            user=cls.user_2,
+            uid=1002
+        )
+        
+        # user 3 - no main, no group, superuser
+        cls.character_3 = EveCharacter.objects.create(
+            character_id=1101,
+            character_name='Lex Luthor',
+            corporation_id=2101,
+            corporation_name='Lex Corp',
+            corporation_ticker='LC',
+            alliance_id=None
+        )
+        EveCorporationInfo.objects.create(
+            corporation_id=2101,
+            corporation_name='Lex Corp',
+            corporation_ticker='LC',            
+            member_count=666,
+            alliance=None
+        )
+        EveAllianceInfo.objects.create(
+            alliance_id='3101',
+            alliance_name='Lex World Domination',
+            alliance_ticker='LWD',
+            executor_corp_id=''
+        )
+        cls.user_3 = User.objects.create_user(
+            cls.character_3.character_name.replace(' ', '_'),
+            'abc@example.com',
+            'password'
+        )
+        CharacterOwnership.objects.create(
+            character=cls.character_3,
+            owner_hash='x1' + cls.character_3.character_name,
+            user=cls.user_3
+        )
+        DiscordUser.objects.create(
+            user=cls.user_3,
+            uid=1003
+        )
+        
+
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.modeladmin = DiscordUserAdmin(
+            model=DiscordUser, admin_site=AdminSite()
+        )    
+    
+    # column rendering
+
+    def test_user_profile_pic_u1(self):
+        expected = ('<img src="https://images.evetech.net/characters/1001/'
+            'portrait?size=32" class="img-circle">')        
+        self.assertEqual(user_profile_pic(self.user_1.discord), expected)
+
+    def test_user_profile_pic_u3(self):
+        self.assertIsNone(user_profile_pic(self.user_3.discord))
+
+    def test_user_username_u1(self):
+        expected = (
+            '<strong><a href="/admin/discord/discorduser/{}/change/">'
+            'Bruce_Wayne</a></strong><br>Bruce Wayne'.format(
+                self.user_1.discord.pk
+            )
+        )
+        self.assertEqual(user_username(self.user_1.discord), expected)
+
+    def test_user_username_u3(self):
+        expected = (
+            '<strong><a href="/admin/discord/discorduser/{}/change/">'
+            'Lex_Luthor</a></strong>'.format(self.user_3.discord.pk)
+        )
+        self.assertEqual(user_username(self.user_3.discord), expected)
+
+    def test_user_main_organization_u1(self):
+        expected = 'Wayne Technologies<br>Wayne Enterprises'
+        result = user_main_organization(self.user_1.discord)
+        self.assertEqual(result, expected)
+
+    def test_user_main_organization_u2(self):
+        expected = 'Daily Planet'
+        result = user_main_organization(self.user_2.discord)
+        self.assertEqual(result, expected)
+
+    def test_user_main_organization_u3(self):
+        expected = None
+        result = user_main_organization(self.user_3.discord)
+        self.assertEqual(result, expected)
+
+    # actions
+
+    # filters    
+    def test_filter_main_corporations(self):
+        
+        class DiscordUserAdminTest(ServicesUserAdmin): 
+            list_filter = (MainCorporationsFilter,)
+                
+        my_modeladmin = DiscordUserAdminTest(DiscordUser, AdminSite())
+
+        # Make sure the lookups are correct
+        request = self.factory.get('/')
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        filters = changelist.get_filters(request)
+        filterspec = filters[0][0]
+        expected = [            
+            ('2002', 'Daily Planet'),
+            ('2001', 'Wayne Technologies'),
+        ]
+        self.assertEqual(filterspec.lookup_choices, expected)
+
+        # Make sure the correct queryset is returned
+        request = self.factory.get(
+            '/', 
+            {'main_corporation_id__exact': self.character_1.corporation_id}
+        )
+        request.user = self.user_1                
+        changelist = my_modeladmin.get_changelist_instance(request)
+        queryset = changelist.get_queryset(request)
+        expected = [self.user_1.discord]
+        self.assertSetEqual(set(queryset), set(expected))
+    
+    def test_filter_main_alliances(self):
+        
+        class DiscordUserAdminTest(ServicesUserAdmin): 
+            list_filter = (MainAllianceFilter,)
+                
+        my_modeladmin = DiscordUserAdminTest(DiscordUser, AdminSite())
+       
+        # Make sure the lookups are correct
+        request = self.factory.get('/')
+        request.user = self.user_1
+        changelist = my_modeladmin.get_changelist_instance(request)
+        filters = changelist.get_filters(request)
+        filterspec = filters[0][0]
+        expected = [            
+            ('3001', 'Wayne Enterprises'),            
+        ]
+        self.assertEqual(filterspec.lookup_choices, expected)
+
+        # Make sure the correct queryset is returned
+        request = self.factory.get(
+            '/', 
+            {'main_alliance_id__exact': self.character_1.alliance_id}
+        )
+        request.user = self.user_1                
+        changelist = my_modeladmin.get_changelist_instance(request)
+        queryset = changelist.get_queryset(request)
+        expected = [self.user_1.discord]
+        self.assertSetEqual(set(queryset), set(expected))
+    

allianceauth/services/modules/discord/tests/test_hooks.py

@@ -0,0 +1,127 @@
+from unittest import mock
+
+from django.test import TestCase, RequestFactory
+from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist
+from allianceauth.tests.auth_utils import AuthUtils
+
+from ..auth_hooks import DiscordService
+from ..models import DiscordUser
+from ..tasks import DiscordTasks
+from ..manager import DiscordOAuthManager
+
+from . import DEFAULT_AUTH_GROUP, add_permissions, MODULE_PATH
+
+
+class DiscordHooksTestCase(TestCase):
+    def setUp(self):
+        self.member = 'member_user'
+        member = AuthUtils.create_member(self.member)
+        DiscordUser.objects.create(user=member, uid='12345')
+        self.none_user = 'none_user'
+        none_user = AuthUtils.create_user(self.none_user)
+        self.service = DiscordService
+        add_permissions()
+
+    def test_has_account(self):
+        member = User.objects.get(username=self.member)
+        none_user = User.objects.get(username=self.none_user)
+        self.assertTrue(DiscordTasks.has_account(member))
+        self.assertFalse(DiscordTasks.has_account(none_user))
+
+    def test_service_enabled(self):
+        service = self.service()
+        member = User.objects.get(username=self.member)
+        none_user = User.objects.get(username=self.none_user)
+
+        self.assertTrue(service.service_active_for_user(member))
+        self.assertFalse(service.service_active_for_user(none_user))
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_update_all_groups(self, manager):
+        service = self.service()
+        service.update_all_groups()
+        # Check member and blue user have groups updated
+        self.assertTrue(manager.update_groups.called)
+        self.assertEqual(manager.update_groups.call_count, 1)
+
+    def test_update_groups(self):
+        # Check member has Member group updated
+        with mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager') as manager:
+            service = self.service()
+            member = User.objects.get(username=self.member)
+            AuthUtils.disconnect_signals()
+            service.update_groups(member)
+            self.assertTrue(manager.update_groups.called)
+            args, kwargs = manager.update_groups.call_args
+            user_id, groups = args
+            self.assertIn(DEFAULT_AUTH_GROUP, groups)
+            self.assertEqual(user_id, member.discord.uid)
+
+        # Check none user does not have groups updated
+        with mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager') as manager:
+            service = self.service()
+            none_user = User.objects.get(username=self.none_user)
+            service.update_groups(none_user)
+            self.assertFalse(manager.update_groups.called)
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_validate_user(self, manager):
+        service = self.service()
+        # Test member is not deleted
+        member = User.objects.get(username=self.member)
+        service.validate_user(member)
+        self.assertTrue(member.discord)
+
+        # Test none user is deleted
+        none_user = User.objects.get(username=self.none_user)
+        DiscordUser.objects.create(user=none_user, uid='abc123')
+        service.validate_user(none_user)
+        self.assertTrue(manager.delete_user.called)
+        with self.assertRaises(ObjectDoesNotExist):
+            none_discord = User.objects.get(username=self.none_user).discord
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_sync_nickname(self, manager):
+        service = self.service()
+        member = User.objects.get(username=self.member)
+        AuthUtils.add_main_character(member, 'test user', '12345', corp_ticker='AAUTH')
+
+        service.sync_nickname(member)
+
+        self.assertTrue(manager.update_nickname.called)
+        args, kwargs = manager.update_nickname.call_args
+        self.assertEqual(args[0], member.discord.uid)
+        self.assertEqual(args[1], 'test user')
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_delete_user(self, manager):
+        member = User.objects.get(username=self.member)
+
+        service = self.service()
+        result = service.delete_user(member)
+
+        self.assertTrue(result)
+        self.assertTrue(manager.delete_user.called)
+        with self.assertRaises(ObjectDoesNotExist):
+            discord_user = User.objects.get(username=self.member).discord
+
+    def test_render_services_ctrl(self):
+        service = self.service()
+        member = User.objects.get(username=self.member)
+        request = RequestFactory().get('/services/')
+        request.user = member
+
+        response = service.render_services_ctrl(request)
+        self.assertTemplateUsed(service.service_ctrl_template)
+        self.assertIn('/discord/reset/', response)
+        self.assertIn('/discord/deactivate/', response)
+
+        # Test register becomes available
+        member.discord.delete()
+        member = User.objects.get(username=self.member)
+        request.user = member
+        response = service.render_services_ctrl(request)
+        self.assertIn('/discord/activate/', response)
+
+    # TODO: Test update nicknames

allianceauth/services/modules/discord/tests/test_managers.py

@@ -2,197 +2,15 @@ import json
 import urllib
 import datetime
 import requests_mock
-from django_webtest import WebTest
 from unittest import mock
 
-from django.test import TestCase, RequestFactory
-from django.contrib.auth.models import User, Group, Permission
-from django.core.exceptions import ObjectDoesNotExist
+from django.test import TestCase
 from django.conf import settings
-from allianceauth.tests.auth_utils import AuthUtils
 
-from .auth_hooks import DiscordService
-from .models import DiscordUser
-from .tasks import DiscordTasks
-from .manager import DiscordOAuthManager
-from . import manager
+from ..manager import DiscordOAuthManager
+from .. import manager
 
-
-MODULE_PATH = 'allianceauth.services.modules.discord'
-DEFAULT_AUTH_GROUP = 'Member'
-
-
-def add_permissions():
-    permission = Permission.objects.get(codename='access_discord')
-    members = Group.objects.get_or_create(name=DEFAULT_AUTH_GROUP)[0]
-    AuthUtils.add_permissions_to_groups([permission], [members])
-
-
-class DiscordHooksTestCase(TestCase):
-    def setUp(self):
-        self.member = 'member_user'
-        member = AuthUtils.create_member(self.member)
-        DiscordUser.objects.create(user=member, uid='12345')
-        self.none_user = 'none_user'
-        none_user = AuthUtils.create_user(self.none_user)
-        self.service = DiscordService
-        add_permissions()
-
-    def test_has_account(self):
-        member = User.objects.get(username=self.member)
-        none_user = User.objects.get(username=self.none_user)
-        self.assertTrue(DiscordTasks.has_account(member))
-        self.assertFalse(DiscordTasks.has_account(none_user))
-
-    def test_service_enabled(self):
-        service = self.service()
-        member = User.objects.get(username=self.member)
-        none_user = User.objects.get(username=self.none_user)
-
-        self.assertTrue(service.service_active_for_user(member))
-        self.assertFalse(service.service_active_for_user(none_user))
-
-    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
-    def test_update_all_groups(self, manager):
-        service = self.service()
-        service.update_all_groups()
-        # Check member and blue user have groups updated
-        self.assertTrue(manager.update_groups.called)
-        self.assertEqual(manager.update_groups.call_count, 1)
-
-    def test_update_groups(self):
-        # Check member has Member group updated
-        with mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager') as manager:
-            service = self.service()
-            member = User.objects.get(username=self.member)
-            AuthUtils.disconnect_signals()
-            service.update_groups(member)
-            self.assertTrue(manager.update_groups.called)
-            args, kwargs = manager.update_groups.call_args
-            user_id, groups = args
-            self.assertIn(DEFAULT_AUTH_GROUP, groups)
-            self.assertEqual(user_id, member.discord.uid)
-
-        # Check none user does not have groups updated
-        with mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager') as manager:
-            service = self.service()
-            none_user = User.objects.get(username=self.none_user)
-            service.update_groups(none_user)
-            self.assertFalse(manager.update_groups.called)
-
-    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
-    def test_validate_user(self, manager):
-        service = self.service()
-        # Test member is not deleted
-        member = User.objects.get(username=self.member)
-        service.validate_user(member)
-        self.assertTrue(member.discord)
-
-        # Test none user is deleted
-        none_user = User.objects.get(username=self.none_user)
-        DiscordUser.objects.create(user=none_user, uid='abc123')
-        service.validate_user(none_user)
-        self.assertTrue(manager.delete_user.called)
-        with self.assertRaises(ObjectDoesNotExist):
-            none_discord = User.objects.get(username=self.none_user).discord
-
-    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
-    def test_sync_nickname(self, manager):
-        service = self.service()
-        member = User.objects.get(username=self.member)
-        AuthUtils.add_main_character(member, 'test user', '12345', corp_ticker='AAUTH')
-
-        service.sync_nickname(member)
-
-        self.assertTrue(manager.update_nickname.called)
-        args, kwargs = manager.update_nickname.call_args
-        self.assertEqual(args[0], member.discord.uid)
-        self.assertEqual(args[1], 'test user')
-
-    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
-    def test_delete_user(self, manager):
-        member = User.objects.get(username=self.member)
-
-        service = self.service()
-        result = service.delete_user(member)
-
-        self.assertTrue(result)
-        self.assertTrue(manager.delete_user.called)
-        with self.assertRaises(ObjectDoesNotExist):
-            discord_user = User.objects.get(username=self.member).discord
-
-    def test_render_services_ctrl(self):
-        service = self.service()
-        member = User.objects.get(username=self.member)
-        request = RequestFactory().get('/services/')
-        request.user = member
-
-        response = service.render_services_ctrl(request)
-        self.assertTemplateUsed(service.service_ctrl_template)
-        self.assertIn('/discord/reset/', response)
-        self.assertIn('/discord/deactivate/', response)
-
-        # Test register becomes available
-        member.discord.delete()
-        member = User.objects.get(username=self.member)
-        request.user = member
-        response = service.render_services_ctrl(request)
-        self.assertIn('/discord/activate/', response)
-
-    # TODO: Test update nicknames
-
-
-class DiscordViewsTestCase(WebTest):
-    def setUp(self):
-        self.member = AuthUtils.create_member('auth_member')
-        AuthUtils.add_main_character(self.member, 'test character', '1234', '2345', 'test corp', 'testc')
-        add_permissions()
-
-    def login(self):
-        self.app.set_user(self.member)
-
-    @mock.patch(MODULE_PATH + '.views.DiscordOAuthManager')
-    def test_activate(self, manager):
-        self.login()
-        manager.generate_oauth_redirect_url.return_value = '/example.com/oauth/'
-        response = self.app.get('/discord/activate/', auto_follow=False)
-        self.assertRedirects(response, expected_url='/example.com/oauth/', target_status_code=404)
-
-    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
-    def test_callback(self, manager):
-        self.login()
-        manager.add_user.return_value = '1234'
-        response = self.app.get('/discord/callback/', params={'code': '1234'})
-
-        self.member = User.objects.get(pk=self.member.pk)
-
-        self.assertTrue(manager.add_user.called)
-        self.assertEqual(manager.update_nickname.called, settings.DISCORD_SYNC_NAMES)
-        self.assertEqual(self.member.discord.uid, '1234')
-        self.assertRedirects(response, expected_url='/services/', target_status_code=200)
-
-    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
-    def test_reset(self, manager):
-        self.login()
-        DiscordUser.objects.create(user=self.member, uid='12345')
-        manager.delete_user.return_value = True
-
-        response = self.app.get('/discord/reset/')
-
-        self.assertRedirects(response, expected_url='/discord/activate/', target_status_code=302)
-
-    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
-    def test_deactivate(self, manager):
-        self.login()
-        DiscordUser.objects.create(user=self.member, uid='12345')
-        manager.delete_user.return_value = True
-
-        response = self.app.get('/discord/deactivate/')
-
-        self.assertTrue(manager.delete_user.called)
-        self.assertRedirects(response, expected_url='/services/', target_status_code=200)
-        with self.assertRaises(ObjectDoesNotExist):
-            discord_user = User.objects.get(pk=self.member.pk).discord
+from . import DEFAULT_AUTH_GROUP, add_permissions, MODULE_PATH
 
 
 class DiscordManagerTestCase(TestCase):

allianceauth/services/modules/discord/tests/test_views.py

@@ -0,0 +1,66 @@
+from django_webtest import WebTest
+from unittest import mock
+
+from django.test import TestCase
+from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist
+from django.conf import settings
+from allianceauth.tests.auth_utils import AuthUtils
+
+from ..models import DiscordUser
+from ..manager import DiscordOAuthManager
+
+from . import DEFAULT_AUTH_GROUP, add_permissions, MODULE_PATH
+
+
+class DiscordViewsTestCase(WebTest):
+    def setUp(self):
+        self.member = AuthUtils.create_member('auth_member')
+        AuthUtils.add_main_character(self.member, 'test character', '1234', '2345', 'test corp', 'testc')
+        add_permissions()
+
+    def login(self):
+        self.app.set_user(self.member)
+
+    @mock.patch(MODULE_PATH + '.views.DiscordOAuthManager')
+    def test_activate(self, manager):
+        self.login()
+        manager.generate_oauth_redirect_url.return_value = '/example.com/oauth/'
+        response = self.app.get('/discord/activate/', auto_follow=False)
+        self.assertRedirects(response, expected_url='/example.com/oauth/', target_status_code=404)
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_callback(self, manager):
+        self.login()
+        manager.add_user.return_value = '1234'
+        response = self.app.get('/discord/callback/', params={'code': '1234'})
+
+        self.member = User.objects.get(pk=self.member.pk)
+
+        self.assertTrue(manager.add_user.called)
+        self.assertEqual(manager.update_nickname.called, settings.DISCORD_SYNC_NAMES)
+        self.assertEqual(self.member.discord.uid, '1234')
+        self.assertRedirects(response, expected_url='/services/', target_status_code=200)
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_reset(self, manager):
+        self.login()
+        DiscordUser.objects.create(user=self.member, uid='12345')
+        manager.delete_user.return_value = True
+
+        response = self.app.get('/discord/reset/')
+
+        self.assertRedirects(response, expected_url='/discord/activate/', target_status_code=302)
+
+    @mock.patch(MODULE_PATH + '.tasks.DiscordOAuthManager')
+    def test_deactivate(self, manager):
+        self.login()
+        DiscordUser.objects.create(user=self.member, uid='12345')
+        manager.delete_user.return_value = True
+
+        response = self.app.get('/discord/deactivate/')
+
+        self.assertTrue(manager.delete_user.called)
+        self.assertRedirects(response, expected_url='/services/', target_status_code=200)
+        with self.assertRaises(ObjectDoesNotExist):
+            discord_user = User.objects.get(pk=self.member.pk).discord

allianceauth/services/modules/discord/views.py

@@ -5,8 +5,10 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.decorators import user_passes_test
 from django.shortcuts import redirect
+from django.utils.translation import gettext_lazy as _
 
 from allianceauth.services.views import superuser_test
+
 from .manager import DiscordOAuthManager
 from .tasks import DiscordTasks
 
@@ -21,10 +23,10 @@ def deactivate_discord(request):
     logger.debug("deactivate_discord called by user %s" % request.user)
     if DiscordTasks.delete_user(request.user):
         logger.info("Successfully deactivated discord for user %s" % request.user)
-        messages.success(request, 'Deactivated Discord account.')
+        messages.success(request, _('Deactivated Discord account.'))
     else:
         logger.error("Unsuccessful attempt to deactivate discord for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your Discord account.')
+        messages.error(request, _('An error occurred while processing your Discord account.'))
     return redirect("services:services")
 
 
@@ -36,7 +38,7 @@ def reset_discord(request):
         logger.info("Successfully deleted discord user for user %s - forwarding to discord activation." % request.user)
         return redirect("discord:activate")
     logger.error("Unsuccessful attempt to reset discord for user %s" % request.user)
-    messages.error(request, 'An error occurred while processing your Discord account.')
+    messages.error(request, _('An error occurred while processing your Discord account.'))
     return redirect("services:services")
 
 
@@ -57,10 +59,10 @@ def discord_callback(request):
         return redirect("services:services")
     if DiscordTasks.add_user(request.user, code):
         logger.info("Successfully activated Discord for user %s" % request.user)
-        messages.success(request, 'Activated Discord account.')
+        messages.success(request, _('Activated Discord account.'))
     else:
         logger.error("Failed to activate Discord for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your Discord account.')
+        messages.error(request, _('An error occurred while processing your Discord account.'))
     return redirect("services:services")
 
 

allianceauth/services/modules/discourse/admin.py

@@ -1,9 +1,11 @@
 from django.contrib import admin
+
 from .models import DiscourseUser
+from ...admin import ServicesUserAdmin
 
 
-class DiscourseUserAdmin(admin.ModelAdmin):
-        list_display = ('user',)
-        search_fields = ('user__username',)
-
-admin.site.register(DiscourseUser, DiscourseUserAdmin)
+@admin.register(DiscourseUser)
+class DiscourseUserAdmin(ServicesUserAdmin):
+    list_display = ServicesUserAdmin.list_display + (        
+        'enabled',        
+    ) 

allianceauth/services/modules/discourse/views.py

@@ -2,6 +2,7 @@ from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render, redirect
+from django.utils.translation import gettext_lazy as _
 
 from .manager import DiscourseManager
 from .tasks import DiscourseTasks
@@ -33,12 +34,12 @@ def discourse_sso(request):
 
     # Check if user has access
     if not request.user.has_perm(ACCESS_PERM):
-        messages.error(request, 'You are not authorized to access Discourse.')
+        messages.error(request, _('You are not authorized to access Discourse.'))
         logger.warning('User %s attempted to access Discourse but does not have permission.' % request.user)
         return redirect('authentication:dashboard')
 
     if not request.user.profile.main_character:
-        messages.error(request, "You must have a main character set to access Discourse.")
+        messages.error(request, _("You must have a main character set to access Discourse."))
         logger.warning('User %s attempted to access Discourse but does not have a main character.' % request.user)
         return redirect('authentication:characters')
 
@@ -48,7 +49,7 @@ def discourse_sso(request):
     signature = request.GET.get('sig')
 
     if None in [payload, signature]:
-        messages.error(request, 'No SSO payload or signature. Please contact support if this problem persists.')
+        messages.error(request, _('No SSO payload or signature. Please contact support if this problem persists.'))
         return redirect('authentication:dashboard')
 
     # Validate the payload
@@ -58,7 +59,7 @@ def discourse_sso(request):
         assert 'nonce' in decoded
         assert len(payload) > 0
     except AssertionError:
-        messages.error(request, 'Invalid payload. Please contact support if this problem persists.')
+        messages.error(request, _('Invalid payload. Please contact support if this problem persists.'))
         return redirect('authentication:dashboard')
 
     key = str(settings.DISCOURSE_SSO_SECRET).encode('utf-8')
@@ -66,7 +67,7 @@ def discourse_sso(request):
     this_signature = h.hexdigest()
 
     if this_signature != signature:
-        messages.error(request, 'Invalid payload. Please contact support if this problem persists.')
+        messages.error(request, _('Invalid payload. Please contact support if this problem persists.'))
         return redirect('authentication:dashboard')
 
     ## Build the return payload

allianceauth/services/modules/ips4/views.py

@@ -3,6 +3,7 @@ import logging
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.shortcuts import render, redirect
+from django.utils.translation import gettext_lazy as _
 
 from allianceauth.services.forms import ServicePasswordForm
 from .manager import Ips4Manager
@@ -27,7 +28,7 @@ def activate_ips4(request):
         logger.debug("Updated authserviceinfo for user %s with IPS4 credentials." % request.user)
         # update_ips4_groups.delay(request.user.pk)
         logger.info("Successfully activated IPS4 for user %s" % request.user)
-        messages.success(request, 'Activated IPSuite4 account.')
+        messages.success(request, _('Activated IPSuite4 account.'))
         credentials = {
             'username': result[0],
             'password': result[1],
@@ -36,7 +37,7 @@ def activate_ips4(request):
                       context={'credentials': credentials, 'service': 'IPSuite4'})
     else:
         logger.error("Unsuccessful attempt to activate IPS4 for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your IPSuite4 account.')
+        messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
     return redirect("services:services")
 
 
@@ -49,7 +50,7 @@ def reset_ips4_password(request):
         # false we failed
         if result != "":
             logger.info("Successfully reset IPS4 password for user %s" % request.user)
-            messages.success(request, 'Reset IPSuite4 password.')
+            messages.success(request, _('Reset IPSuite4 password.'))
             credentials = {
                 'username': request.user.ips4.username,
                 'password': result,
@@ -58,7 +59,7 @@ def reset_ips4_password(request):
                           context={'credentials': credentials, 'service': 'IPSuite4'})
 
     logger.error("Unsuccessful attempt to reset IPS4 password for user %s" % request.user)
-    messages.error(request, 'An error occurred while processing your IPSuite4 account.')
+    messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
     return redirect("services:services")
 
 
@@ -76,10 +77,10 @@ def set_ips4_password(request):
             result = Ips4Manager.update_custom_password(request.user.ips4.username, plain_password=password)
             if result != "":
                 logger.info("Successfully set IPS4 password for user %s" % request.user)
-                messages.success(request, 'Set IPSuite4 password.')
+                messages.success(request, _('Set IPSuite4 password.'))
             else:
                 logger.error("Failed to install custom IPS4 password for user %s" % request.user)
-                messages.error(request, 'An error occurred while processing your IPSuite4 account.')
+                messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
             return redirect('services:services')
     else:
         logger.debug("Request is not type POST - providing empty form.")
@@ -96,9 +97,9 @@ def deactivate_ips4(request):
     logger.debug("deactivate_ips4 called by user %s" % request.user)
     if Ips4Tasks.delete_user(request.user):
         logger.info("Successfully deactivated IPS4 for user %s" % request.user)
-        messages.success(request, 'Deactivated IPSuite4 account.')
+        messages.success(request, _('Deactivated IPSuite4 account.'))
     else:
         logger.error("Unsuccessful attempt to deactivate IPS4 for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your IPSuite4 account.')
+        messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
     return redirect("services:services")
 

allianceauth/services/modules/market/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'allianceauth.services.modules.market.apps.MarketServiceConfig'

allianceauth/services/modules/market/admin.py

@@ -1,9 +0,0 @@
-from django.contrib import admin
-from .models import MarketUser
-
-
-class MarketUserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'username')
-        search_fields = ('user__username', 'username')
-
-admin.site.register(MarketUser, MarketUserAdmin)

allianceauth/services/modules/market/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class MarketServiceConfig(AppConfig):
-    name = 'allianceauth.services.modules.market'
-    label = 'market'

allianceauth/services/modules/market/auth_hooks.py

@@ -1,54 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.template.loader import render_to_string
-
-from allianceauth import hooks
-from allianceauth.services.hooks import ServicesHook
-from .tasks import MarketTasks
-from .urls import urlpatterns
-
-logger = logging.getLogger(__name__)
-
-
-class MarketService(ServicesHook):
-    def __init__(self):
-        ServicesHook.__init__(self)
-        self.name = 'market'
-        self.urlpatterns = urlpatterns
-        self.service_url = settings.MARKET_URL
-        self.access_perm = 'market.access_market'
-
-    @property
-    def title(self):
-        return "Alliance Market"
-
-    def delete_user(self, user, notify_user=False):
-        logger.debug('Deleting user %s %s account' % (user, self.name))
-        return MarketTasks.delete_user(user, notify_user=notify_user)
-
-    def validate_user(self, user):
-        logger.debug('Validating user %s %s account' % (user, self.name))
-        if MarketTasks.has_account(user) and not self.service_active_for_user(user):
-            self.delete_user(user)
-
-    def service_active_for_user(self, user):
-        return user.has_perm(self.access_perm)
-
-    def render_services_ctrl(self, request):
-        urls = self.Urls()
-        urls.auth_activate = 'evernusmarket:activate'
-        urls.auth_deactivate = 'evernusmarket:deactivate'
-        urls.auth_reset_password = 'evernusmarket:reset_password'
-        urls.auth_set_password = 'evernusmarket:set_password'
-        return render_to_string(self.service_ctrl_template, {
-            'service_name': self.title,
-            'urls': urls,
-            'service_url': self.service_url,
-            'username': request.user.market.username if MarketTasks.has_account(request.user) else ''
-        }, request=request)
-
-
-@hooks.register('services_hook')
-def register_service():
-    return MarketService()

allianceauth/services/modules/market/manager.py

@@ -1,152 +0,0 @@
-import logging
-import random
-import string
-import re
-
-from django.db import connections
-from passlib.hash import bcrypt
-from django.conf import settings
-
-# requires yum install libffi-devel and pip install bcrypt
-
-logger = logging.getLogger(__name__)
-
-
-TABLE_PREFIX = getattr(settings, 'MARKET_TABLE_PREFIX', 'fos_')
-
-
-class MarketManager:
-    def __init__(self):
-        pass
-
-    SQL_ADD_USER = r"INSERT INTO %suser (username, username_canonical, email, email_canonical, enabled, salt," \
-                   r"password, locked, expired, roles, credentials_expired, characterid, characterName)" \
-                   r"VALUES (%%s, %%s, %%s, %%s, 1,%%s, %%s, 0, 0, 'a:0:{}', 0, %%s, %%s) " % TABLE_PREFIX
-    SQL_GET_USER_ID = r"SELECT id FROM %suser WHERE username = %%s" % TABLE_PREFIX
-    SQL_DISABLE_USER = r"UPDATE %suser SET enabled = '0' WHERE username = %%s" % TABLE_PREFIX
-    SQL_ENABLE_USER = r"UPDATE %suser SET enabled = '1' WHERE username = %%s" % TABLE_PREFIX
-    SQL_UPDATE_PASSWORD = r"UPDATE %suser SET password = %%s, salt = %%s WHERE username = %%s" % TABLE_PREFIX
-    SQL_CHECK_EMAIL = r"SELECT email FROM %suser WHERE email = %%s" % TABLE_PREFIX
-    SQL_CHECK_USERNAME = r"SELECT username FROM %suser WHERE username = %%s" % TABLE_PREFIX
-    SQL_UPDATE_USER = r"UPDATE %suser SET password = %%s, salt = %%s, enabled = '1' WHERE username = %%s" % TABLE_PREFIX
-
-    @staticmethod
-    def __santatize_username(username):
-        sanatized = username.replace(" ", "_")
-        return sanatized.lower()
-
-    @staticmethod
-    def __generate_random_pass():
-        return ''.join([random.choice(string.ascii_letters + string.digits) for n in range(16)])
-
-    @staticmethod
-    def _gen_pwhash(password):
-        return bcrypt.using(ident='2y').encrypt(password.encode('utf-8'), rounds=13)
-
-    @staticmethod
-    def _get_salt(pw_hash):
-        search = re.compile(r"^\$2[a-z]?\$([0-9]+)\$(.{22})(.{31})$")
-        match = re.match(search, pw_hash)
-        return match.group(2)
-
-    @classmethod
-    def check_username(cls, username):
-        logger.debug("Checking alliance market username %s" % username)
-        cursor = connections['market'].cursor()
-        cursor.execute(cls.SQL_CHECK_USERNAME, [cls.__santatize_username(username)])
-        row = cursor.fetchone()
-        if row:
-            logger.debug("Found user %s on alliance market" % username)
-            return True
-        logger.debug("User %s not found on alliance market" % username)
-        return False
-
-    @classmethod
-    def check_user_email(cls, username, email):
-        logger.debug("Checking if alliance market email exists for user %s" % username)
-        cursor = connections['market'].cursor()
-        cursor.execute(cls.SQL_CHECK_EMAIL, [email])
-        row = cursor.fetchone()
-        if row:
-            logger.debug("Found user %s email address on alliance market" % username)
-            return True
-        logger.debug("User %s email address not found on alliance market" % username)
-        return False
-
-    @classmethod
-    def add_user(cls, username, email, characterid, charactername):
-        logger.debug("Adding new market user %s" % username)
-        plain_password = cls.__generate_random_pass()
-        hash = cls._gen_pwhash(plain_password)
-        salt = cls._get_salt(hash)
-        username_clean = cls.__santatize_username(username)
-        if not cls.check_username(username):
-            if not cls.check_user_email(username, email):
-                try:
-                    logger.debug("Adding user %s to alliance market" % username)
-                    cursor = connections['market'].cursor()
-                    cursor.execute(cls.SQL_ADD_USER, [username_clean, username_clean, email, email, salt,
-                                                                hash, characterid, charactername])
-                    return username_clean, plain_password
-                except:
-                    logger.debug("Unsuccessful attempt to add market user %s" % username)
-                    return "", ""
-            else:
-                logger.debug("Alliance market email %s already exists Updating instead" % email)
-                username_clean, password = cls.update_user_info(username)
-                return username_clean, password
-        else:
-            logger.debug("Alliance market username %s already exists Updating instead" % username)
-            username_clean, password = cls.update_user_info(username)
-            return username_clean, password
-
-    @classmethod
-    def disable_user(cls, username):
-        logger.debug("Disabling alliance market user %s " % username)
-        cursor = connections['market'].cursor()
-        cursor.execute(cls.SQL_DISABLE_USER, [username])
-        return True
-
-    @classmethod
-    def update_custom_password(cls, username, plain_password):
-        logger.debug("Updating alliance market user %s password" % username)
-        if cls.check_username(username):
-            username_clean = cls.__santatize_username(username)
-            hash = cls._gen_pwhash(plain_password)
-            salt = cls._get_salt(hash)
-            cursor = connections['market'].cursor()
-            cursor.execute(cls.SQL_UPDATE_PASSWORD, [hash, salt, username_clean])
-            return plain_password
-        else:
-            logger.error("Unable to update alliance market user %s password" % username)
-            return ""
-
-    @classmethod
-    def update_user_password(cls, username):
-        logger.debug("Updating alliance market user %s password" % username)
-        if cls.check_username(username):
-            username_clean = cls.__santatize_username(username)
-            plain_password = cls.__generate_random_pass()
-            hash = cls._gen_pwhash(plain_password)
-            salt = cls._get_salt(hash)
-            cursor = connections['market'].cursor()
-            cursor.execute(cls.SQL_UPDATE_PASSWORD, [hash, salt, username_clean])
-            return plain_password
-        else:
-            logger.error("Unable to update alliance market user %s password" % username)
-            return ""
-
-    @classmethod
-    def update_user_info(cls, username):
-        logger.debug("Updating alliance market user %s" % username)
-        try:
-            username_clean = cls.__santatize_username(username)
-            plain_password = cls.__generate_random_pass()
-            hash = cls._gen_pwhash(plain_password)
-            salt = cls._get_salt(hash)
-            cursor = connections['market'].cursor()
-            cursor.execute(cls.SQL_UPDATE_USER, [hash, salt, username_clean])
-            return username_clean, plain_password
-        except:
-            logger.debug("Alliance market update user failed for %s" % username)
-            return "", ""

allianceauth/services/modules/market/migrations/0001_initial.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.2 on 2016-12-12 03:27
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('auth', '0008_alter_user_username_max_length'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='MarketUser',
-            fields=[
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='market', serialize=False, to=settings.AUTH_USER_MODEL)),
-                ('username', models.CharField(max_length=254)),
-            ],
-        ),
-    ]

allianceauth/services/modules/market/migrations/0002_service_permissions.py

@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-02-02 05:59
-from __future__ import unicode_literals
-
-from django.db import migrations
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
-from django.contrib.auth.management import create_permissions
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def migrate_service_enabled(apps, schema_editor):
-    for app_config in apps.get_app_configs():
-        app_config.models_module = True
-        create_permissions(app_config, apps=apps, verbosity=0)
-        app_config.models_module = None
-        
-    Group = apps.get_model("auth", "Group")
-    Permission = apps.get_model("auth", "Permission")
-    MarketUser = apps.get_model("market", "MarketUser")
-
-    perm = Permission.objects.get(codename='access_market')
-
-    member_group_name = getattr(settings, str('DEFAULT_AUTH_GROUP'), 'Member')
-    blue_group_name = getattr(settings, str('DEFAULT_BLUE_GROUP'), 'Blue')
-
-    # Migrate members
-    if MarketUser.objects.filter(user__groups__name=member_group_name).exists() or \
-            getattr(settings, str('ENABLE_AUTH_MARKET'), False):
-        try:
-            group = Group.objects.get(name=member_group_name)
-            group.permissions.add(perm)
-        except ObjectDoesNotExist:
-            logger.warning('Failed to migrate ENABLE_AUTH_MARKET setting')
-
-    # Migrate blues
-    if MarketUser.objects.filter(user__groups__name=blue_group_name).exists() or \
-            getattr(settings, str('ENABLE_BLUE_MARKET'), False):
-        try:
-            group = Group.objects.get(name=blue_group_name)
-            group.permissions.add(perm)
-        except ObjectDoesNotExist:
-            logger.warning('Failed to migrate ENABLE_BLUE_MARKET setting')
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('market', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='marketuser',
-            options={'permissions': (('access_market', 'Can access the Evernus Market service'),)},
-        ),
-        migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop),
-    ]

allianceauth/services/modules/market/models.py

@@ -1,18 +0,0 @@
-from django.contrib.auth.models import User
-from django.db import models
-
-
-class MarketUser(models.Model):
-    user = models.OneToOneField(User,
-                                primary_key=True,
-                                on_delete=models.CASCADE,
-                                related_name='market')
-    username = models.CharField(max_length=254)
-
-    def __str__(self):
-        return self.username
-
-    class Meta:
-        permissions = (
-            ("access_market", u"Can access the Evernus Market service"),
-        )

allianceauth/services/modules/market/tasks.py

@@ -1,36 +0,0 @@
-import logging
-
-from django.core.exceptions import ObjectDoesNotExist
-
-from allianceauth.notifications import notify
-from .manager import MarketManager
-from .models import MarketUser
-
-logger = logging.getLogger(__name__)
-
-
-class MarketTasks:
-    def __init__(self):
-        pass
-
-    @classmethod
-    def delete_user(cls, user, notify_user=False):
-        if cls.has_account(user):
-            logger.debug("User %s has a Market account %s. Deleting." % (user, user.market.username))
-            if MarketManager.disable_user(user.market.username):
-                user.market.delete()
-                if notify_user:
-                    notify(user, 'Alliance Market Account Disabled', level='danger')
-                return True
-        return False
-
-    @staticmethod
-    def has_account(user):
-        try:
-            return user.market.username != ''
-        except ObjectDoesNotExist:
-            return False
-
-    @staticmethod
-    def disable():
-        MarketUser.objects.all().delete()

allianceauth/services/modules/market/tests.py

@@ -1,183 +0,0 @@
-from unittest import mock
-
-from django.test import TestCase, RequestFactory
-from django import urls
-from django.contrib.auth.models import User, Group, Permission
-from django.core.exceptions import ObjectDoesNotExist
-
-from allianceauth.tests.auth_utils import AuthUtils
-
-from .auth_hooks import MarketService
-from .models import MarketUser
-from .tasks import MarketTasks
-
-MODULE_PATH = 'allianceauth.services.modules.market'
-DEFAULT_AUTH_GROUP = 'Member'
-
-
-def add_permissions():
-    permission = Permission.objects.get(codename='access_market')
-    members = Group.objects.get_or_create(name=DEFAULT_AUTH_GROUP)[0]
-    AuthUtils.add_permissions_to_groups([permission], [members])
-
-
-class MarketHooksTestCase(TestCase):
-    def setUp(self):
-        self.member = 'member_user'
-        member = AuthUtils.create_member(self.member)
-        MarketUser.objects.create(user=member, username=self.member)
-        self.none_user = 'none_user'
-        none_user = AuthUtils.create_user(self.none_user)
-        self.service = MarketService
-        add_permissions()
-
-    def test_has_account(self):
-        member = User.objects.get(username=self.member)
-        none_user = User.objects.get(username=self.none_user)
-        self.assertTrue(MarketTasks.has_account(member))
-        self.assertFalse(MarketTasks.has_account(none_user))
-
-    def test_service_enabled(self):
-        service = self.service()
-        member = User.objects.get(username=self.member)
-        none_user = User.objects.get(username=self.none_user)
-
-        self.assertTrue(service.service_active_for_user(member))
-        self.assertFalse(service.service_active_for_user(none_user))
-
-    @mock.patch(MODULE_PATH + '.tasks.MarketManager')
-    def test_delete_user(self, manager):
-        member = User.objects.get(username=self.member)
-
-        service = self.service()
-        result = service.delete_user(member)
-
-        self.assertTrue(result)
-        self.assertTrue(manager.disable_user.called)
-        with self.assertRaises(ObjectDoesNotExist):
-            market_user = User.objects.get(username=self.member).market
-
-    @mock.patch(MODULE_PATH + '.tasks.MarketManager')
-    def test_validate_user(self, manager):
-        service = self.service()
-        # Test member is not deleted
-        member = User.objects.get(username=self.member)
-        service.validate_user(member)
-        self.assertTrue(User.objects.get(username=self.member).market)
-
-        # Test none user is deleted
-        none_user = User.objects.get(username=self.none_user)
-        MarketUser.objects.create(user=none_user, username='abc123')
-        service.validate_user(none_user)
-        self.assertTrue(manager.disable_user.called)
-        with self.assertRaises(ObjectDoesNotExist):
-            none_svc = User.objects.get(username=self.none_user).market
-
-    def test_render_services_ctrl(self):
-        service = self.service()
-        member = User.objects.get(username=self.member)
-        request = RequestFactory().get('/services/')
-        request.user = member
-
-        response = service.render_services_ctrl(request)
-        self.assertTemplateUsed(service.service_ctrl_template)
-        self.assertIn(urls.reverse('evernusmarket:set_password'), response)
-        self.assertIn(urls.reverse('evernusmarket:reset_password'), response)
-        self.assertIn(urls.reverse('evernusmarket:deactivate'), response)
-
-        # Test register becomes available
-        member.market.delete()
-        member = User.objects.get(username=self.member)
-        request.user = member
-        response = service.render_services_ctrl(request)
-        self.assertIn(urls.reverse('evernusmarket:activate'), response)
-
-
-class MarketViewsTestCase(TestCase):
-    def setUp(self):
-        self.member = AuthUtils.create_member('auth_member')
-        self.member.email = 'auth_member@example.com'
-        self.member.save()
-        AuthUtils.add_main_character(self.member, 'auth_member', '12345', corp_id='111', corp_name='Test Corporation')
-        add_permissions()
-
-    def login(self):
-        self.client.force_login(self.member)
-
-    @mock.patch(MODULE_PATH + '.views.MarketManager')
-    def test_activate(self, manager):
-        self.login()
-        expected_username = 'auth_member'
-        expected_password = 'password'
-        expected_id = '1234'
-
-        manager.add_user.return_value = (expected_username, expected_password, expected_id)
-
-        response = self.client.get(urls.reverse('evernusmarket:activate'), follow=False)
-
-        self.assertTrue(manager.add_user.called)
-        args, kwargs = manager.add_user.call_args
-        self.assertEqual(args[0], expected_username)
-        self.assertEqual(args[1], self.member.email)
-
-        self.assertTemplateUsed(response, 'services/service_credentials.html')
-        self.assertContains(response, expected_username)
-        self.assertContains(response, expected_password)
-
-    @mock.patch(MODULE_PATH + '.tasks.MarketManager')
-    def test_deactivate(self, manager):
-        self.login()
-        MarketUser.objects.create(user=self.member, username='12345')
-        manager.disable_user.return_value = True
-
-        response = self.client.get(urls.reverse('evernusmarket:deactivate'))
-
-        self.assertTrue(manager.disable_user.called)
-        self.assertRedirects(response, expected_url=urls.reverse('services:services'), target_status_code=200)
-        with self.assertRaises(ObjectDoesNotExist):
-            market_user = User.objects.get(pk=self.member.pk).market
-
-    @mock.patch(MODULE_PATH + '.views.MarketManager')
-    def test_set_password(self, manager):
-        self.login()
-        MarketUser.objects.create(user=self.member, username='12345')
-        expected_password = 'password'
-        manager.update_user_password.return_value = expected_password
-
-        response = self.client.post(urls.reverse('evernusmarket:set_password'), data={'password': expected_password})
-
-        self.assertTrue(manager.update_custom_password.called)
-        args, kwargs = manager.update_custom_password.call_args
-        self.assertEqual(args[1], expected_password)
-        self.assertRedirects(response, expected_url=urls.reverse('services:services'), target_status_code=200)
-
-    @mock.patch(MODULE_PATH + '.views.MarketManager')
-    def test_reset_password(self, manager):
-        self.login()
-        MarketUser.objects.create(user=self.member, username='12345')
-
-        response = self.client.get(urls.reverse('evernusmarket:reset_password'))
-
-        self.assertTrue(manager.update_user_password.called)
-        self.assertTemplateUsed(response, 'services/service_credentials.html')
-
-
-class MarketManagerTestCase(TestCase):
-    def setUp(self):
-        from .manager import MarketManager
-        self.manager = MarketManager
-
-    def test_generate_random_password(self):
-        password = self.manager._MarketManager__generate_random_pass()
-
-        self.assertEqual(len(password), 16)
-        self.assertIsInstance(password, type(''))
-
-    def test_gen_pwhash(self):
-        pwhash = self.manager._gen_pwhash('test')
-        salt = self.manager._get_salt(pwhash)
-
-        self.assertIsInstance(pwhash, str)
-        self.assertGreaterEqual(len(pwhash), 59)
-        self.assertIsInstance(salt, str)
-        self.assertEqual(len(salt), 22)

allianceauth/services/modules/market/urls.py

@@ -1,17 +0,0 @@
-from django.conf.urls import url, include
-
-from . import views
-
-app_name = 'evernusmarket'
-
-module_urls = [
-    # Alliance Market Control
-    url(r'^activate/$', views.activate_market, name='activate'),
-    url(r'^deactivate/$', views.deactivate_market, name='deactivate'),
-    url(r'^reset_password/$', views.reset_market_password, name='reset_password'),
-    url(r'^set_password/$', views.set_market_password, name='set_password'),
-]
-
-urlpatterns = [
-    url(r'^evernus-market/', include((module_urls, app_name), namespace=app_name))
-]

allianceauth/services/modules/market/views.py

@@ -1,104 +0,0 @@
-import logging
-
-from django.contrib import messages
-from django.contrib.auth.decorators import login_required, permission_required
-from django.shortcuts import render, redirect
-
-from allianceauth.services.forms import ServicePasswordForm
-from .manager import MarketManager
-from .models import MarketUser
-from .tasks import MarketTasks
-
-logger = logging.getLogger(__name__)
-
-ACCESS_PERM = 'market.access_market'
-
-
-@login_required
-@permission_required(ACCESS_PERM)
-def activate_market(request):
-    logger.debug("activate_market called by user %s" % request.user)
-    character = request.user.profile.main_character
-    if character is not None:
-        logger.debug("Adding market user for user %s with main character %s" % (request.user, character))
-        result = MarketManager.add_user(character.character_name, request.user.email, character.character_id,
-                                        character.character_name)
-        # if empty we failed
-        if result[0] != "":
-            MarketUser.objects.create(user=request.user, username=result[0])
-            logger.debug("Updated authserviceinfo for user %s with market credentials." % request.user)
-            logger.info("Successfully activated market for user %s" % request.user)
-            messages.success(request, 'Activated Alliance Market account.')
-            credentials = {
-                'username': result[0],
-                'password': result[1],
-            }
-            return render(request, 'services/service_credentials.html',
-                          context={'credentials': credentials, 'service': 'Alliance Market'})
-    logger.error("Unsuccessful attempt to activate market for user %s" % request.user)
-    messages.error(request, 'An error occurred while processing your Alliance Market account.')
-    return redirect("services:services")
-
-
-@login_required
-@permission_required(ACCESS_PERM)
-def deactivate_market(request):
-    logger.debug("deactivate_market called by user %s" % request.user)
-    # false we failed
-    if MarketTasks.delete_user(request.user):
-        logger.info("Successfully deactivated market for user %s" % request.user)
-        messages.success(request, 'Deactivated Alliance Market account.')
-    else:
-        logger.error("Unsuccessful attempt to activate market for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your Alliance Market account.')
-    return redirect("services:services")
-
-
-@login_required
-@permission_required(ACCESS_PERM)
-def reset_market_password(request):
-    logger.debug("reset_market_password called by user %s" % request.user)
-    if MarketTasks.has_account(request.user):
-        result = MarketManager.update_user_password(request.user.market.username)
-        # false we failed
-        if result != "":
-            logger.info("Successfully reset market password for user %s" % request.user)
-            messages.success(request, 'Reset Alliance Market password.')
-            credentials = {
-                'username': request.user.market.username,
-                'password': result,
-            }
-            return render(request, 'services/service_credentials.html',
-                          context={'credentials': credentials, 'service': 'Alliance Market'})
-
-    logger.error("Unsuccessful attempt to reset market password for user %s" % request.user)
-    messages.error(request, 'An error occurred while processing your Alliance Market account.')
-    return redirect("services:services")
-
-
-@login_required
-@permission_required(ACCESS_PERM)
-def set_market_password(request):
-    logger.debug("set_market_password called by user %s" % request.user)
-    if request.method == 'POST':
-        logger.debug("Received POST request with form.")
-        form = ServicePasswordForm(request.POST)
-        logger.debug("Form is valid: %s" % form.is_valid())
-        if form.is_valid() and MarketTasks.has_account(request.user):
-            password = form.cleaned_data['password']
-            logger.debug("Form contains password of length %s" % len(password))
-            result = MarketManager.update_custom_password(request.user.market.username, password)
-            if result != "":
-                logger.info("Successfully reset market password for user %s" % request.user)
-                messages.success(request, 'Set Alliance Market password.')
-            else:
-                logger.error("Failed to install custom market password for user %s" % request.user)
-                messages.error(request, 'An error occurred while processing your Alliance Market account.')
-            return redirect("services:services")
-    else:
-        logger.debug("Request is not type POST - providing empty form.")
-        form = ServicePasswordForm()
-
-    logger.debug("Rendering form for user %s" % request.user)
-    context = {'form': form, 'service': 'Market'}
-    return render(request, 'services/service_password.html', context=context)

allianceauth/services/modules/mumble/admin.py

@@ -1,10 +1,18 @@
 from django.contrib import admin
+
 from .models import MumbleUser
+from ...admin import ServicesUserAdmin
 
 
-class MumbleUserAdmin(admin.ModelAdmin):
-        fields = ('user', 'username', 'groups')  # pwhash is hidden from admin panel
-        list_display = ('user', 'username', 'groups')
-        search_fields = ('user__username', 'username', 'groups')
+@admin.register(MumbleUser)
+class MumbleUserAdmin(ServicesUserAdmin):            
+    list_display = ServicesUserAdmin.list_display + (        
+        'username',        
+        'groups',
+    )     
+    search_fields = ServicesUserAdmin.search_fields + (        
+        'username',
+        'groups'
+    )
 
-admin.site.register(MumbleUser, MumbleUserAdmin)
+    fields = ('user', 'username', 'groups')  # pwhash is hidden from admin panel

allianceauth/services/modules/openfire/admin.py

@@ -1,9 +1,11 @@
 from django.contrib import admin
+
 from .models import OpenfireUser
+from ...admin import ServicesUserAdmin
 
 
-class OpenfireUserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'username')
-        search_fields = ('user__username', 'username')
+@admin.register(OpenfireUser)
+class OpenfireUserAdmin(ServicesUserAdmin):
+    list_display = ServicesUserAdmin.list_display + ('username',)         
+    search_fields = ServicesUserAdmin.search_fields + ('username', )
 
-admin.site.register(OpenfireUser, OpenfireUserAdmin)

allianceauth/services/modules/openfire/auth_hooks.py

@@ -2,6 +2,7 @@ import logging
 
 from django.conf import settings
 from django.template.loader import render_to_string
+from django.utils.translation import gettext_lazy as _
 
 from allianceauth import hooks
 from allianceauth.services.hooks import ServicesHook, MenuItemHook
@@ -22,7 +23,7 @@ class OpenfireService(ServicesHook):
 
     @property
     def title(self):
-        return "Jabber"
+        return _("Jabber")
 
     def delete_user(self, user, notify_user=False):
         logger.debug('Deleting user %s %s account' % (user, self.name))
@@ -74,7 +75,7 @@ def register_service():
 class JabberBroadcast(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
-                              'Jabber Broadcast',
+                              _('Jabber Broadcast'),
                               'fa fa-lock fa-fw fa-bullhorn',
                               'openfire:broadcast')
 
@@ -87,7 +88,7 @@ class JabberBroadcast(MenuItemHook):
 class FleetBroadcastFormatter(MenuItemHook):
     def __init__(self):
         MenuItemHook.__init__(self,
-                              'Fleet Broadcast Formatter',
+                              _('Fleet Broadcast Formatter'),
                               'fa fa-lock fa-fw fa-space-shuttle',
                               'services:fleet_format_tool')
 

allianceauth/services/modules/openfire/views.py

@@ -5,8 +5,10 @@ from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.models import Group
 from django.shortcuts import render, redirect
+from django.utils.translation import gettext_lazy as _
 
 from allianceauth.services.forms import ServicePasswordForm
+
 from .forms import JabberBroadcastForm
 from .manager import OpenfireManager, PingBotException
 from .models import OpenfireUser
@@ -25,12 +27,12 @@ def activate_jabber(request):
     logger.debug("Adding jabber user for user %s with main character %s" % (request.user, character))
     info = OpenfireManager.add_user(OpenfireTasks.get_username(request.user))
     # If our username is blank means we already had a user
-    if info[0] is not "":
+    if info[0] != "":
         OpenfireUser.objects.update_or_create(user=request.user, defaults={'username': info[0]})
         logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user)
         OpenfireTasks.update_groups.delay(request.user.pk)
         logger.info("Successfully activated jabber for user %s" % request.user)
-        messages.success(request, 'Activated jabber account.')
+        messages.success(request, _('Activated jabber account.'))
         credentials = {
             'username': info[0],
             'password': info[1],
@@ -39,7 +41,7 @@ def activate_jabber(request):
                       context={'credentials': credentials, 'service': 'Jabber'})
     else:
         logger.error("Unsuccessful attempt to activate jabber for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your jabber account.')
+        messages.error(request, _('An error occurred while processing your jabber account.'))
     return redirect("services:services")
 
 
@@ -52,7 +54,7 @@ def deactivate_jabber(request):
         messages.success(request, 'Deactivated jabber account.')
     else:
         logger.error("Unsuccessful attempt to deactivate jabber for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your jabber account.')
+        messages.error(request, _('An error occurred while processing your jabber account.'))
     return redirect("services:services")
 
 
@@ -65,7 +67,7 @@ def reset_jabber_password(request):
         # If our username is blank means we failed
         if result != "":
             logger.info("Successfully reset jabber password for user %s" % request.user)
-            messages.success(request, 'Reset jabber password.')
+            messages.success(request, _('Reset jabber password.'))
             credentials = {
                 'username': request.user.openfire.username,
                 'password': result,
@@ -73,7 +75,7 @@ def reset_jabber_password(request):
             return render(request, 'services/service_credentials.html',
                           context={'credentials': credentials, 'service': 'Jabber'})
     logger.error("Unsuccessful attempt to reset jabber for user %s" % request.user)
-    messages.error(request, 'An error occurred while processing your jabber account.')
+    messages.error(request, _('An error occurred while processing your jabber account.'))
     return redirect("services:services")
 
 
@@ -114,7 +116,7 @@ def jabber_broadcast_view(request):
 
                 OpenfireManager.send_broadcast_message(group_to_send, message_to_send)
 
-                messages.success(request, 'Sent jabber broadcast to %s' % group_to_send)
+                messages.success(request, _('Sent jabber broadcast to %s' % group_to_send))
                 logger.info("Sent jabber broadcast on behalf of user %s" % request.user)
             except PingBotException as e:
                 messages.error(request, e)
@@ -143,10 +145,10 @@ def set_jabber_password(request):
             result = OpenfireManager.update_user_pass(request.user.openfire.username, password=password)
             if result != "":
                 logger.info("Successfully set jabber password for user %s" % request.user)
-                messages.success(request, 'Set jabber password.')
+                messages.success(request, _('Set jabber password.'))
             else:
                 logger.error("Failed to install custom jabber password for user %s" % request.user)
-                messages.error(request, 'An error occurred while processing your jabber account.')
+                messages.error(request, _('An error occurred while processing your jabber account.'))
             return redirect("services:services")
     else:
         logger.debug("Request is not type POST - providing empty form.")

allianceauth/services/modules/phpbb3/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
 from .models import Phpbb3User
+from ...admin import ServicesUserAdmin
 
 
-class Phpbb3UserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'username')
-        search_fields = ('user__username', 'username')
-
-admin.site.register(Phpbb3User, Phpbb3UserAdmin)
+@admin.register(Phpbb3User)
+class Phpbb3UserAdmin(ServicesUserAdmin):
+    list_display = ServicesUserAdmin.list_display + ('username',)         
+    search_fields = ServicesUserAdmin.search_fields + ('username', )

allianceauth/services/modules/phpbb3/views.py

@@ -3,8 +3,10 @@ import logging
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required
 from django.shortcuts import render, redirect
+from django.utils.translation import gettext_lazy as _
 
 from allianceauth.services.forms import ServicePasswordForm
+
 from .manager import Phpbb3Manager
 from .models import Phpbb3User
 from .tasks import Phpbb3Tasks
@@ -29,7 +31,7 @@ def activate_forum(request):
         logger.debug("Updated authserviceinfo for user %s with forum credentials. Updating groups." % request.user)
         Phpbb3Tasks.update_groups.delay(request.user.pk)
         logger.info("Successfully activated forum for user %s" % request.user)
-        messages.success(request, 'Activated forum account.')
+        messages.success(request, _('Activated forum account.'))
         credentials = {
             'username': result[0],
             'password': result[1],
@@ -38,7 +40,7 @@ def activate_forum(request):
                       context={'credentials': credentials, 'service': 'Forum'})
     else:
         logger.error("Unsuccessful attempt to activate forum for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your forum account.')
+        messages.error(request, _('An error occurred while processing your forum account.'))
     return redirect("services:services")
 
 
@@ -49,10 +51,10 @@ def deactivate_forum(request):
     # false we failed
     if Phpbb3Tasks.delete_user(request.user):
         logger.info("Successfully deactivated forum for user %s" % request.user)
-        messages.success(request, 'Deactivated forum account.')
+        messages.success(request, _('Deactivated forum account.'))
     else:
         logger.error("Unsuccessful attempt to activate forum for user %s" % request.user)
-        messages.error(request, 'An error occurred while processing your forum account.')
+        messages.error(request, _('An error occurred while processing your forum account.'))
     return redirect("services:services")
 
 
@@ -66,7 +68,7 @@ def reset_forum_password(request):
         # false we failed
         if result != "":
             logger.info("Successfully reset forum password for user %s" % request.user)
-            messages.success(request, 'Reset forum password.')
+            messages.success(request, _('Reset forum password.'))
             credentials = {
                 'username': request.user.phpbb3.username,
                 'password': result,
@@ -75,7 +77,7 @@ def reset_forum_password(request):
                           context={'credentials': credentials, 'service': 'Forum'})
 
     logger.error("Unsuccessful attempt to reset forum password for user %s" % request.user)
-    messages.error(request, 'An error occurred while processing your forum account.')
+    messages.error(request, _('An error occurred while processing your forum account.'))
     return redirect("services:services")
 
 
@@ -95,10 +97,10 @@ def set_forum_password(request):
                                                         password=password)
             if result != "":
                 logger.info("Successfully set forum password for user %s" % request.user)
-                messages.success(request, 'Set forum password.')
+                messages.success(request, _('Set forum password.'))
             else:
                 logger.error("Failed to install custom forum password for user %s" % request.user)
-                messages.error(request, 'An error occurred while processing your forum account.')
+                messages.error(request, _('An error occurred while processing your forum account.'))
             return redirect("services:services")
     else:
         logger.debug("Request is not type POST - providing empty form.")