Version Bump v2.6.0

Improve admin site lists for users, groups and service users

See merge request allianceauth/allianceauth!1164

.gitignore

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

.gitlab-ci.yml

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

.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

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.0'
 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.contrib.auth.models import User as BaseUser, \
-from django.utils.text import slugify
+    Permission as BasePermission, Group
-from django.db.models import Q
+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
+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
+    from allianceauth.eveonline.autogroups.models import *
+else:
+    _has_auto_groups = False
 
 
 def make_service_hooks_update_groups_action(service):
@@ -83,41 +101,323 @@ 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())
+                
+
 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 update_main_character_model(self, 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
+
+        self.message_user(
+            request, 
+            'Update from ESI started for {} characters'.format(tasks_count)
+        )
+
+    update_main_character_model.short_description = \
+        'Update main character model from ESI'
+
     def get_actions(self, request):
         actions = super(BaseUserAdmin, self).get_actions(request)
 
+        actions[self.update_main_character_model.__name__] = (
+            self.update_main_character_model, 
+            self.update_main_character_model.__name__, 
+            self.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,
+                actions[action.__name__] = (
-                                            action.__name__,
+                    action, 
-                                            action.short_description)
+                    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,
+                actions[action.__name__] = (
-                                            action.__name__,
+                    action, action.__name__, 
-                                            action.short_description)
+                    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):
+    ordering = ('username', )
-        return obj.profile.main_character
+    list_select_related = True
-    get_main_character.short_description = "Main Character"
+    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):
+    list_filter = ( 
-        return obj.profile.state
+        'profile__state',
-    get_state.short_description = "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 +427,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']
+    filter_horizontal = [
-    list_display = ('name', 'priority', 'user_count')
+        '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 +489,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')
+    class Media:
-    search_fields = ('user__username', 'character__character_name', 'character__corporation_name', 'character__alliance_name')
+        css = {
+            "all": ("authentication/css/admin.css",)
+        }
+     
+    list_select_related = True
+    list_display = (
+        user_profile_pic,
+        user_username,
+        user_main_organization,
+        'character',
+    )
+    search_fields = (
+        'user__user', 
+        '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 %}
+                            {% with request.user.profile.main_character as main %}
-                        <div class="col-lg-4 col-sm-2">
+                                <div class="hidden-xs">
-                            <table class="table">
+                                    <div class="col-lg-4 col-sm-2">
-                                <tr>
+                                        <table class="table">
-                                    <td class="text-center">
+                                            <tr>
-                                        <img class="ra-avatar"src="{{ main.portrait_url_128 }}">
+                                                <td class="text-center">
-                                    </td>
+                                                    <img class="ra-avatar"src="{{ main.portrait_url_128 }}">
-                                </tr>
+                                                </td>
-                                <tr>
+                                            </tr>
-                                    <td class="text-center">{{ main.character_name }}</td>
+                                            <tr>
-                                </tr>
+                                                <td class="text-center">{{ main.character_name }}</td>
-                            </table>
+                                            </tr>
-                        </div>
+                                        </table>
-                        <div class="col-lg-4 col-sm-2">
+                                    </div>
-                            <table class="table">
+                                    <div class="col-lg-4 col-sm-2">
-                                <tr>
+                                        <table class="table">
-                                    <td class="text-center">
+                                            <tr>
-                                        <img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
+                                                <td class="text-center">
-                                    </td>
+                                                    <img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
-                                </tr>
+                                                </td>
-                                <tr>
+                                            </tr>
-                                    <td class="text-center">{{ main.corporation_name }}</td>
+                                            <tr>
-                                </tr>
+                                                <td class="text-center">{{ main.corporation_name }}</td>
-                            </table>
+                                            </tr>
-                        </div>
+                                        </table>
-                        <div class="col-lg-4 col-sm-2">
+                                    </div>
-                            {% if main.alliance_id %}
+                                    <div class="col-lg-4 col-sm-2">
-                            <table class="table">
+                                        {% if main.alliance_id %}
-                                <tr>
+                                            <table class="table">
-                                    <td class="text-center">
+                                                <tr>
-                                        <img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
+                                                    <td class="text-center">
-                                    </td>
+                                                        <img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
-                                </tr>
+                                                    </td>
-                                <tr>
+                                                </tr>
-                                    <td class="text-center">{{ main.alliance_name }}</td>
+                                                <tr>
-                                <tr>
+                                                    <td class="text-center">{{ main.alliance_name }}</td>
-                            </table>
+                                                <tr>
-                            {% endif %}
+                                            </table>
-                        </div>
+                                        {% endif %}
-                        {% endwith %}
+                                    </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">
+                        <div class="row">
-                            <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
+                            <div class="col-sm-6 button-wrapper">
-                               title="Add Character">{% trans 'Add Character' %}</a>
+                                <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
-                        </div>
+                                title="Add Character">{% trans 'Add Character' %}</a>
-                        <div class="col-xs-6">
+                            </div>
-                            <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
+                            <div class="col-sm-6 button-wrapper">
-                               title="Change Main Character">{% trans "Change Main" %}</a>
+                                <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 "Groups" %}</h3>
+                    </div>
                     <div class="panel-body">
                         <div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
-                            <table class="table table-striped">
+                            <table class="table table-aa">
                                 {% for group in user.groups.all %}
-                                <tr>
+                                    <tr>
-                                    <td>{{ group.name }}</td>
+                                        <td>{{ group.name }}</td>
-                                </tr>
+                                    </tr>
                                 {% endfor %}
                             </table>
                         </div>
@@ -90,26 +112,52 @@
         </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-heading">
-            <div class="panel-body">
+                <h3 class="panel-title text-center" style="text-align: center">
-                <table class="table table-hover">
+                    {% trans 'Characters' %}
-                    <tr>
+                </h3>
-                        <th class="text-center"></th>
+            </div>
-                        <th class="text-center">{% trans 'Name' %}</th>
+            <div class="panel-body">                
-                        <th class="text-center">{% trans 'Corp' %}</th>
+                <table class="table table-aa hidden-xs">
-                        <th class="text-center">{% trans 'Alliance' %}</th>
+                    <thead>
-                    </tr>
+                        <tr>
-                    {% for ownership in request.user.character_ownerships.all %}
+                            <th class="text-center"></th>
-                    {% with ownership.character as char %}
+                            <th class="text-center">{% trans 'Name' %}</th>
-                    <tr>
+                            <th class="text-center">{% trans 'Corp' %}</th>
-                        <td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
+                            <th class="text-center">{% trans 'Alliance' %}</th>
-                        </td>
+                        </tr>
-                        <td class="text-center">{{ char.character_name }}</td>
+                    </thead>
-                        <td class="text-center">{{ char.corporation_name }}</td>
+                    <tbody>
-                        <td class="text-center">{{ char.alliance_name }}</td>
+                        {% for ownership in request.user.character_ownerships.all %}
-                    </tr>
+                            {% with ownership.character as char %}
-                    {% endwith %}
+                                <tr>
-                    {% endfor %}
+                                    <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 %}
+                    </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 %}
+{% block middle_box_content %}    
-    <p style="text-align:center">
+    <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}">
-        <a href="{% url 'auth_sso_login' %}">
+        <img class="img-responsive center-block" src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
-            <img src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
+    </a>
-        </a>
-    </p>
 {% 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/tests/test_admin.py

@@ -0,0 +1,439 @@
+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 as BaseUser, Group
+
+from allianceauth.authentication.models import CharacterOwnership, State
+from allianceauth.eveonline.autogroups.models import AutogroupsConfig
+from allianceauth.eveonline.models import (
+    EveCharacter, EveCorporationInfo, EveAllianceInfo
+)
+
+from ..admin import (
+    BaseUserAdmin, 
+    MainCorporationsFilter,
+    MainAllianceFilter,
+    User,
+    UserAdmin,     
+    user_main_organization,
+    user_profile_pic, 
+    user_username,     
+)
+
+
+MODULE_PATH = 'allianceauth.authentication.admin'
+
+
+class MockRequest(object):
+    
+    def __init__(self, user=None):
+        self.user = user
+
+
+class TestUserAdmin(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # groups
+        cls.group_1 = Group.objects.create(
+            name='Group 1'
+        )
+        cls.group_2 = Group.objects.create(
+            name='Group 2'
+        )
+        
+        # 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)        
+
+        # 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()
+
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.modeladmin = UserAdmin(
+            model=User, admin_site=AdminSite()
+        )
+
+    def _create_autogroups(self):
+        """create autogroups for corps and alliances"""
+        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])
+        self.modeladmin.update_main_character_model(
+            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))

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,108 @@
+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/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
+                        <td class="text-center col-lg-6{% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}">
-                                {% if corpstats.corp.alliance %}{% else %}col-lg-offset-3{% endif %}"><img
+                                <img class="ra-avatar" src="{{ corpstats.corp.logo_url_64 }}">
-                                class="ra-avatar" src="{{ corpstats.corp.logo_url_128 }}"></td>
+                            </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">
+                        <div class="pull-right hidden-xs">
-                            {% trans "Last update:" %} {{ corpstats.last_update|naturaltime }}
+                            {% 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">
+                            <a class="btn btn-success" type="button" href="{% url 'corputils:update' corpstats.corp.corporation_id %}" title="Update Now">
-                                    <span class="glyphicon glyphicon-refresh"></span>
+                                <span class="glyphicon glyphicon-refresh"></span>
-                                </a>
+                            </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:
+                    if main.corporation_id == corpstats.corp.corporation_id:
-                        mains[main.character_id] = {'main':main, 'alts':[]}
+                        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):
+    def __init__(self, token=None, adapter=None):        
-        self.client = esi_client_factory(token=token, spec_file=SWAGGER_SPEC_PATH)
+        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/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(MODULE_PATH + '.EveSwaggerProvider.get_alliance')
-    @patch('allianceauth.eveonline.providers.EveSwaggerProvider.get_corp')
+    @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/groupmanagement/admin.py

@@ -1,11 +1,24 @@
+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.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
+    from allianceauth.eveonline.autogroups.models import *
+else:
+    _has_auto_groups = False
+
+
 class AuthGroupInlineAdmin(admin.StackedInline):
     model = AuthGroup
     filter_horizontal = ('group_leaders', 'group_leader_groups', 'states',)
@@ -13,6 +26,17 @@ class AuthGroupInlineAdmin(admin.StackedInline):
     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\
+                .filter(profile__state__name='Member')\
+                .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 +47,116 @@ 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',
+        IsAutoGroupFilter,
+        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/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">
+                        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 "Character" %}</th>
-                                <th class="text-center" scope="col">{% trans "Group" %}</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 %}
+                                {% for entry in entries %}
-                                <tr>
+                                    <tr>
-                                    <td class="text-center">{{ entry.date }}</td>
+                                        <td class="text-center">{{ entry.date }}</td>
-                                    <td class="text-center">{{ entry.requestor }}</td>
+                                        <td class="text-center">{{ entry.requestor }}</td>
-                                    <td class="text-center">{{ entry.req_char }}</td>
+                                        <td class="text-center">{{ entry.req_char }}</td>
-                                    <td class="text-center">{{ entry.group }}</td>
+                                        <td class="text-center">{{ entry.req_char.corporation_name }}</td>
-                                    <td class="text-center">{{ entry.type_to_str }}</td>
+                                        <td class="text-center">{{ entry.type_to_str }}</td>
-                                    {% if entry.request_type is None %}
+                                        {% if entry.request_type is None %}
-                                        <td class="text-center"> Removed</td>
+                                            <td class="text-center"> Removed</td>
-                                    {% else %}
+                                        {% else %}
-                                        <td class="text-center">{{ entry.action_to_str }}</td>
+                                            <td class="text-center">{{ entry.action_to_str }}</td>
-                                    {% endif %}
+                                        {% endif %}
-                                    <td class="text-center">{{ entry.request_actor }}</td>
+                                        <td class="text-center">{{ entry.request_actor }}</td>
-                                </tr>
+                                    </tr>
-                            {% endfor %}
+                                {% endfor %}
                             </tbody>
                         </table>
+                        <p class="text-muted">
+                            All times displayed are EVE/UTC.
+                        </p>
                     </div>
-                {% else %}
+                {% else %}                                        
-                    <div class="alert alert-warning text-center">{% trans "No entries found for this group." %}</div>
+                    <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 class="panel-body">                
-                <div id="list" class="">
+                <p>                    
-                    {% if group.user_set %}
+                    <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
-                    <table class="table">
+                        Back
-                        <tr>                    
+                    </a>
-                            <th class="text-center">{% trans "Leader" %}</th>
+                </p>                
-                            <th class="text-center">{% trans "Portrait" %}</th>
+                {% if group.user_set %}                    
-                            <th class="text-center">{% trans "Character" %}</th>
+                    <div class="table-responsive">
-                            <th class="text-center">{% trans "Corporation" %}</th>
+                        <table class="table table-aa" id="tab_group_members">
-                            <th class="text-center">{% trans "Alliance" %}</th>
+                            <thead>
-                            <th class="text-center">{% trans "Action" %}</th>
+                                <tr>                                                        
-                        </tr>
+                                    <th class="text-right">{% trans "Portrait" %}</th>
-                        {% for member in members %}
+                                    <th class="text-center">{% trans "Character" %}</th>
-                            <tr>                        
+                                    <th class="text-center">{% trans "Organization" %}</th>                                    
-                                <td class="text-center">
+                                    <th class="text-center"></th>
-                                    {% if member.is_leader %}
+                                </tr>
-                                    <i class="fa fa-star"></i>
+                            </thead>
-                                    {% endif %}
+                            <tbody>
-                                </td>
+                                {% for member in members %}
-                                <td class="text-center">
+                                    <tr>                                                                
-                                    <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">
+                                        <td class="text-right">
-                                </td>
+                                            {% if member.is_leader %}
-                                <td class="text-center">
+                                                <i class="fa fa-star"></i>&nbsp;
-                                    <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
+                                            {% endif %}
-                                        {{ member.main_char.character_name }}
+                                            <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">                                            
-                                    </a>
+                                        </td>
-                                </td>
+                                        <td class="text-center">
-                                <td class="text-center">
+                                            {% if member.main_char %}
-                                    <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
+                                                <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
-                                        {{ member.main_char.corporation_name }}
+                                                    {{ member.main_char.character_name }}
-                                    </a>
+                                                </a>
-                                </td>                        
+                                            {% else %}
-                                <td class="text-center">
+                                                {{ member.user.username }}
-                                    <a href="{{ member.main_char|dotlan_alliance_url }}" target="_blank">
+                                            {% endif %}
-                                        {{ member.main_char.alliance_name|default_if_none:"" }}
+                                        </td>
-                                    </a>
+                                        <td class="text-center">
-                                </td>
+                                            {% if member.main_char %}
-                                <td class="text-center">
+                                                <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
-                                    <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger"
+                                                    {{ member.main_char.corporation_name }}
-                                        title="{% trans "Remove from group" %}">
+                                                </a><br>
-                                            <i class="glyphicon glyphicon-remove"></i>
+                                                {{ member.main_char.alliance_name|default_if_none:"" }}
-                                    </a>
+                                            {% else %}
-                                </td>
+                                                (unknown)
-                            </tr>
+                                            {% endif %}
-                        {% endfor %}
+                                        </td>                                                                
-                    </table>
+                                        <td class="text-center">
-                    {% else %}
+                                            <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger"
-                        <div class="alert alert-warning text-center">{% trans "No group members to list." %}</div>
+                                                title="{% trans "Remove from group" %}">
-                    {% endif %}
+                                                    <i class="glyphicon glyphicon-remove"></i>
-                </div>
+                                            </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

@@ -15,44 +15,54 @@
             </div>
             <div class="panel-body">
                 {% if groups %}                    
-                    <table class="table">
+                    <div class="table-responsive">
-                        <tr>
+                        <table class="table table-aa">
-                            <th class="text-center">{% trans "Name" %}</th>
+                            <thead>
-                            <th class="text-center">{% trans "Description" %}</th>
+                                <tr>
-                            <th class="text-center">{% trans "Status" %}</th>
+                                    <th class="text-center">{% trans "Name" %}</th>
-                            <th class="text-center">{% trans "Member Count" %}</th>
+                                    <th class="text-center">{% trans "Description" %}</th>
-                            <th class="text-center">{% trans "Action" %}</th>
+                                    <th class="text-center">{% trans "Status" %}</th>
-                        </tr>
+                                    <th class="text-center">{% trans "Member Count" %}</th>
-                        {% for group in groups %}
+                                    <th class="text-center"></th>
-                            <tr>
+                                </tr>
-                                <td class="text-center">{{ group.name }}</td>
+                            </thead>
-                                <td class="text-center">{{ group.authgroup.description }}</td>
+                            <tbody>
-                                <td class="text-center">
+                                {% for group in groups %}
-                                    {% if group.authgroup.hidden %}
+                                    <tr>
-                                        <span class="label label-info">{% trans "Hidden" %}</span>
+                                        <td class="text-center">
-                                    {% elif group.authgroup.open %}
+                                            <a href="{% url 'groupmanagement:membership_list' group.id %}">{{ group.name }}</a>
-                                        <span class="label label-success">{% trans "Open" %}</span>
+                                        </td>
-                                    {% else %}
+                                        <td class="text-center">{{ group.authgroup.description }}</td>
-                                        <span class="label label-default">{% trans "Requestable" %}</span>
+                                        <td class="text-center">
-                                    {% endif %}
+                                            {% if group.authgroup.hidden %}
-                                </td>
+                                                <span class="label label-info">{% trans "Hidden" %}</span>
-                                <td class="text-center">
+                                            {% elif group.authgroup.open %}
-                                    {{ group.num_members }}
+                                                <span class="label label-success">{% trans "Open" %}</span>
-                                </td>
+                                            {% else %}
-                                <td class="text-center">
+                                                <span class="label label-default">{% trans "Requestable" %}</span>
-                                    <a href="{% url 'groupmanagement:membership_list' group.id %}" class="btn btn-primary"
+                                            {% endif %}
-                                        title="{% trans "View Members" %}">
+                                        </td>
-                                            <i class="glyphicon glyphicon-eye-open"></i>
+                                        <td class="text-center">
-                                    </a>
+                                            {{ group.num_members }}
-                                    <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}">
+                                        </td>
-                                        <i class="glyphicon glyphicon-list-alt"></i>
+                                        <td class="text-center">
-                                    </a>
+                                            <a href="{% url 'groupmanagement:membership_list' group.id %}" class="btn btn-primary"
-                                </td>
+                                                title="{% trans "View Members" %}">
-                            </tr>
+                                                    <i class="glyphicon glyphicon-eye-open"></i>
-                        {% endfor %}
+                                            </a>
-                    </table>
+                                            <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">
+            <table class="table table-aa">
-            <tr>
+                <thead>
-                <th class="text-center">{% trans "Name" %}</th>
+                    <tr>
-                <th class="text-center">{% trans "Description" %}</th>
+                        <th class="text-center">{% trans "Name" %}</th>
-                <th class="text-center">{% trans "Action" %}</th>
+                        <th class="text-center">{% trans "Description" %}</th>
-            </tr>
+                        <th class="text-center">{% trans "Action" %}</th>
-
+                    </tr>
-            {% for g in groups %}
+                </thead>
-                <tr>
+                <tbody>
-                    <td class="text-center">{{ g.group.name }}</td>
+                    {% for g in groups %}
-                    <td class="text-center">{{ g.group.authgroup.description|urlize }}</td>
+                        <tr>
-                    <td class="text-center">
+                            <td class="text-center">{{ g.group.name }}</td>
-                        {% if g.group in user.groups.all %}
+                            <td class="text-center">{{ g.group.authgroup.description|urlize }}</td>
-                            {% if not g.request %}
+                            <td class="text-center">
-                                <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
+                                {% if g.group in user.groups.all %}
-                                    {% trans "Leave" %}
+                                    {% if not g.request %}
-                                </a>
+                                        <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
-                            {% else %}
+                                            {% trans "Leave" %}
-                                <button type="button" class="btn btn-primary" disabled>
+                                        </a>
-                                    {{ g.request.status }}
+                                    {% else %}
-                                </button>
+                                        <button type="button" class="btn btn-primary" disabled>
-                            {% endif %}
+                                            {{ g.request.status }}
-                        {% elif not g.request %}
+                                        </button>
-                            {% if g.group.authgroup.open %}
+                                    {% endif %}
-                                <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
+                                {% elif not g.request %}
-                                    {% trans "Join" %}
+                                    {% if g.group.authgroup.open %}
-                                </a>
+                                        <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-success">
-                            {% else %}
+                                            {% trans "Join" %}
-                                <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
+                                        </a>
-                                    {% trans "Request" %}
+                                    {% else %}
-                                </a>
+                                        <a href="{% url 'groupmanagement:request_add' g.group.id %}" class="btn btn-primary">
-                            {% endif %}
+                                            {% trans "Request" %}
-                        {% else %}
+                                        </a>
-                            <button type="button" class="btn btn-primary" disabled>
+                                    {% endif %}
-                                {{ g.request.status }}
+                                {% else %}
-                            </button>
+                                    <button type="button" class="btn btn-primary" disabled>
-                        {% endif %}
+                                        {{ g.request.status }}
-                    </td>
+                                    </button>
-                </tr>
+                                {% endif %}
-            {% endfor %}
+                            </td>
-        </table>
+                        </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 class="active"><a data-toggle="tab" href="#add">{% trans "Join Requests" %}</a></li>
-            <li><a data-toggle="tab" href="#leave">{% trans "Group Leave 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">
+                    <div class="table-responsive">
-                        <tr>
+                        <table class="table table-aa">
-                            <th class="text-center">{% trans "#" %}</th>
+                            <thead>
-                            <th class="text-center">{% trans "Portrait" %}</th>
+                                <tr>                                    
-                            <th class="text-center">{% trans "Character" %}</th>
+                                    <th class="text-center"></th>
-                            <th class="text-center">{% trans "Corporation" %}</th>
+                                    <th class="text-center">{% trans "Character" %}</th>
-                            <th class="text-center">{% trans "Alliance" %}</th>
+                                    <th class="text-center">{% trans "Organization" %}</th>                                    
-                            <th class="text-center">{% trans "Group" %}</th>
+                                    <th class="text-center">{% trans "Group" %}</th>
-                            <th class="text-center"></th>
+                                    <th class="text-center"></th>
-                        </tr>
+                                </tr>
-                        {% for acceptrequest in acceptrequests %}
+                            </thead>
-                            <tr>
+                            <tbody>
-                                <td class="text-center">{{ acceptrequest.id }}</td>
+                                {% for acceptrequest in acceptrequests %}
-                                <td class="text-center">
+                                    <tr>                                        
-                                    <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle">
+                                        <td class="text-right">
-                                </td>
+                                            <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle">
-                                <td class="text-center">
+                                        </td>
-                                    <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
+                                        <td class="text-center">                                          
-                                        {{ acceptrequest.main_char.character_name }}
+                                            {% if acceptrequest.main_char %}
-                                    </a>
+                                                <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
-                                </td>
+                                                    {{ acceptrequest.main_char.character_name }}
-                                <td class="text-center">
+                                                </a>
-                                    <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                            {% else %}
-                                        {{ acceptrequest.main_char.corporation_name }}
+                                                {{ acceptrequest.user.username }}
-                                    </a>
+                                            {% endif %}
-                                </td>
+                                        </td>
-                                <td class="text-center">
+                                        <td class="text-center">
-                                    <a href="{{ acceptrequest.main_char|dotlan_alliance_url }}" target="_blank">
+                                            {% if acceptrequest.main_char %}
-                                        {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
+                                                <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                    </a>
+                                                    {{ acceptrequest.main_char.corporation_name }}
-                                </td>                     
+                                                </a><br>
-                                <td class="text-center">{{ acceptrequest.group.name }}</td>
+                                                {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
-                                <td class="text-center">
+                                            {% else %}
-                                    <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
+                                                (unknown)
-                                        {% trans "Accept" %}
+                                            {% endif %}
-                                    </a>
+                                        </td>                                        
-                                    <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
+                                        <td class="text-center">{{ acceptrequest.group.name }}</td>
-                                        {% trans "Reject" %}
+                                        <td class="text-center">
-                                    </a>
+                                            <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
-                                </td>
+                                                {% trans "Accept" %}
-                            </tr>
+                                            </a>
-                        {% endfor %}
+                                            <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                    </table>
+                                                {% 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">
+                    <div class="table-responsive">
-                        <tr>
+                        <table class="table table-aa">
-                            <th class="text-center">{% trans "#" %}</th>
+                            <thead>
-                            <th class="text-center">{% trans "Portrait" %}</th>
+                                <tr>                                    
-                            <th class="text-center">{% trans "Character" %}</th>
+                                    <th class="text-center"></th>
-                            <th class="text-center">{% trans "Corporation" %}</th>
+                                    <th class="text-center">{% trans "Character" %}</th>
-                            <th class="text-center">{% trans "Alliance" %}</th>
+                                    <th class="text-center">{% trans "Organization" %}</th>                                    
-                            <th class="text-center">{% trans "Group" %}</th>
+                                    <th class="text-center">{% trans "Group" %}</th>
-                            <th class="text-center"></th>
+                                    <th class="text-center"></th>
-                        </tr>
+                                </tr>
-                        {% for leaverequest in leaverequests %}
+                            </thead>
-                            <tr>
+                            <tbody>
-                                <td class="text-center">{{ leaverequest.id }}</td>
+                                {% for leaverequest in leaverequests %}
-                                <td class="text-center">
+                                    <tr>                                        
-                                    <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle">
+                                        <td class="text-right">
-                                </td>
+                                            <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle">
-                                <td class="text-center">
+                                        </td>
-                                    <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
+                                        <td class="text-center">
-                                        {{ leaverequest.main_char.character_name }}
+                                            {% if leaverequest.main_char %}
-                                    </a>
+                                                <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
-                                </td>
+                                                    {{ leaverequest.main_char.character_name }}
-                                <td class="text-center">
+                                                </a>
-                                    <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                            {% else %}
-                                        {{ leaverequest.main_char.corporation_name }}
+                                                {{ leaverequest.user.username }}
-                                    </a>
+                                            {% endif %}
-                                </td>
+                                        </td>
-                                <td class="text-center">
+                                        <td class="text-center">
-                                    <a href="{{ leaverequest.main_char|dotlan_alliance_url }}" target="_blank">
+                                            {% if leaverequest.main_char %}
-                                        {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
+                                                <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                    </a>
+                                                    {{ leaverequest.main_char.corporation_name }}
-                                </td>  
+                                                </a><br>
-                                <td class="text-center">{{ leaverequest.group.name }}</td>
+                                                {{ leaverequest.main_char.alliance_name|default_if_none:"" }}                               
-                                <td class="text-center">
+                                            {% else %}
-                                    <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
+                                                (unknown)
-                                        {% trans "Accept" %}
+                                            {% endif %}
-                                    </a>
+                                        </td>                                        
-                                    <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
+                                        <td class="text-center">{{ leaverequest.group.name }}</td>
-                                        {% trans "Reject" %}
+                                        <td class="text-center">
-                                    </a>
+                                            <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
-                                </td>
+                                                {% trans "Accept" %}
-                            </tr>
+                                            </a>
-                        {% endfor %}
+                                            <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
-                    </table>
+                                                {% 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/test_admin.py

@@ -0,0 +1,379 @@
+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, State
+from allianceauth.eveonline.autogroups.models import AutogroupsConfig
+from allianceauth.eveonline.models import (
+    EveCharacter, EveCorporationInfo, EveAllianceInfo
+)
+
+from ..admin import (
+   IsAutoGroupFilter,
+   HasLeaderFilter,
+   GroupAdmin,   
+   Group
+)
+
+
+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"""
+        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)
+
+    @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
+    
+    @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))
+    

allianceauth/locale/es/LC_MESSAGES/django.po

@@ -1443,56 +1443,6 @@ msgstr "Ping Enviado"
 msgid "Broadcast"
 msgstr ""
 
-#: allianceauth/services/modules/seat/views.py:40
-#, python-format
-msgid "Successfully activated your %(service)s account."
-msgstr "Se activo con exito el %(service)s en tu cuenta."
-
-#: allianceauth/services/modules/seat/views.py:49
-#, python-format
-msgid ""
-"Failed to activate your %(service)s account, please contact your "
-"administrator."
-msgstr "Fallo al activar el %(service)s en tu cuenta, por favor contacta a tu administrador."
-
-#: allianceauth/services/modules/seat/views.py:62
-#, python-format
-msgid "Successfully deactivated your %(service)s account."
-msgstr "Se desactivo el servicio %(service)s con exito."
-
-#: allianceauth/services/modules/seat/views.py:68
-#, python-format
-msgid ""
-"Failed to deactivate your %(service)s account, please contact your "
-"administrator."
-msgstr "Fallo al desactivar el servicio %(service)s, por favor contacta a tu administrador."
-
-#: allianceauth/services/modules/seat/views.py:87
-#, python-format
-msgid "Successfully reset your %(service)s password."
-msgstr "Se restablecio con exito tu contraseña del servicio %(service)s."
-
-#: allianceauth/services/modules/seat/views.py:93
-#, python-format
-msgid ""
-"Failed to reset your %(service)s password, please contact your administrator."
-msgstr "Fallo al restablecer tu contraseña en el servicio %(service)s, por favor contacta a tu adminsitrador."
-
-#: allianceauth/services/modules/seat/views.py:114
-#, python-format
-msgid "Successfully set your %(service)s password."
-msgstr "Se cambio con exito tu contraseña en el servicio %(service)s"
-
-#: allianceauth/services/modules/seat/views.py:119
-#, python-format
-msgid ""
-"Failed to set your %(service)s password, please contact your administrator."
-msgstr "Fallo al cambiar tu contraseña en %(service)s, por favor contacta a tu administrador."
-
-#: allianceauth/services/modules/seat/views.py:123
-msgid "Invalid password."
-msgstr "Contraseña invalida."
-
 #: allianceauth/services/modules/teamspeak3/forms.py:14
 #, python-format
 msgid "Unable to locate user %s on server"

allianceauth/optimer/templates/optimer/fleetoptable.html

@@ -2,44 +2,46 @@
 {% load evelinks %}
 
 {% block content %}
-     <table class="table">
+     <div class="table-responsive">
-        <thead>
+        <table class="table">
-            <tr>
+            <thead>
-                <th class="text-center col-lg-3">{% trans "Operation Name" %}</th>
+                <tr>
-                <th class="text-center col lg-2">{% trans "Doctrine" %}</th>
+                    <th class="text-center col-lg-3">{% trans "Operation Name" %}</th>
-                <th class="text-center col-lg-1">{% trans "Form Up System" %}</th>
+                    <th class="text-center col lg-2">{% trans "Doctrine" %}</th>
-                <th class="text-center col-lg-1">{% trans "Start Time" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Form Up System" %}</th>
-                <th class="text-center col-lg-1">{% trans "Local Time" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Start Time" %}</th>
-                <th class="text-center col-lg-1">{% trans "Duration" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Local Time" %}</th>
-                <th class="text-center col-lg-1">{% trans "FC" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Duration" %}</th>
-                {% if perms.auth.optimer_management %}
+                    <th class="text-center col-lg-1">{% trans "FC" %}</th>
-                <th class="text-center col-lg-1">{% trans "Creator" %}</th>
+                    {% if perms.auth.optimer_management %}
-                <th class="text-center col-lg-2">{% trans "Action" %}</th>
+                    <th class="text-center col-lg-1">{% trans "Creator" %}</th>
-                {% endif %}
+                    <th class="text-center col-lg-2">{% trans "Action" %}</th>
-            </tr>
+                    {% endif %}
-        </thead>
+                </tr>
-     {% for ops in timers %}
+            </thead>
-         <tbody>
+            {% for ops in timers %}
-            <tr>
+                <tbody>
-                <td class="text-center">{{ ops.operation_name }}</td>
+                    <tr>
-                <td class="text-center">{{ ops.doctrine }}</td>
+                        <td class="text-center">{{ ops.operation_name }}</td>
-                <td class="text-center">
+                        <td class="text-center">{{ ops.doctrine }}</td>
-                    <a href="{{ ops.system|dotlan_solar_system_url }}">{{ ops.system }}</a>
+                        <td class="text-center">
-                </td>
+                            <a href="{{ ops.system|dotlan_solar_system_url }}">{{ ops.system }}</a>
-                <td class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
+                        </td>
-                <td class="text-center" nowrap><div id="localtime{{ ops.id }}"></div><div id="countdown{{ ops.id }}"></div></td>
+                        <td class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
-                <td class="text-center">{{ ops.duration }}</td>
+                        <td class="text-center" nowrap><div id="localtime{{ ops.id }}"></div><div id="countdown{{ ops.id }}"></div></td>
-                <td class="text-center">{{ ops.fc }}</td>
+                        <td class="text-center">{{ ops.duration }}</td>
-                {% if perms.auth.optimer_management %}
+                        <td class="text-center">{{ ops.fc }}</td>
-                    <td class="text-center">{{ ops.eve_character }}</td>
+                        {% if perms.auth.optimer_management %}
-                    <td class="text-center">
+                            <td class="text-center">{{ ops.eve_character }}</td>
-                        <a href="{% url 'optimer:remove' ops.id %}" class="btn btn-danger">
+                            <td class="text-center">
-                        <span class="glyphicon glyphicon-remove"></span>
+                                <a href="{% url 'optimer:remove' ops.id %}" class="btn btn-danger">
-                    </a><a href="{% url 'optimer:edit' ops.id %}" class="btn btn-info"><span class="glyphicon glyphicon-pencil"></span></a>
+                                <span class="glyphicon glyphicon-remove"></span>
-                    </td>
+                            </a><a href="{% url 'optimer:edit' ops.id %}" class="btn btn-info"><span class="glyphicon glyphicon-pencil"></span></a>
-                {% endif %}
+                            </td>
-            </tr>
+                        {% endif %}
-        </tbody>
+                    </tr>
-    {% endfor %}
+                </tbody>
-    </table>
+            {% 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">
+        <p>
-            <i class="glyphicon glyphicon-chevron-left"></i> {% trans "Back" %}
+            <a href="{% url 'permissions_tool:overview' %}" class="btn btn-default">
-        </a>
+                <i class="glyphicon glyphicon-chevron-left"></i> {% trans "Back" %}
-        <table class="table table-hover">
+            </a>
-            <thead>
+        </p>
-                <tr>
+        <div class="table-responsive">
-                    <th class="col-md-3">
+            <table class="table table-striped" id="tab_permissions_audit">
-                        {% trans "Group" %}
+                <thead>
-                    </th>
+                    <tr>
-                    <th class="col-md-3">
+                        <th>{% trans "Group" %}</th>
-                        {% trans "User" %}
+                        <th></th>
-                    </th>
+                        <th>{% trans "User / Character" %}</th>
-                </tr>
+                        <th>{% trans "Organization" %}</th>
-            </thead>
+                    </tr>
-            <tbody>
+                </thead>
-            {% for user in permission.users %}
+                <tbody>
-                <tr>
+                {% for user in permission.users %}                    
-                    {% include 'permissions_tool/audit_row.html' with group="Permission Granted Directly (No Group)" %}
+                    {% include 'permissions_tool/audit_row.html' with type="User" name="Permission granted directlty" %}
-                </tr>
-            {% endfor %}
-            {% for group in permission.groups %}
-                {% for user in group.user_set.all %}
-                    {% include 'permissions_tool/audit_row.html' %}
                 {% endfor %}
-            {% endfor %}
+                {% for group in permission.groups %}
-            {% for state in permission.states %}
+                    {% for user in group.user_set.all %}
-                {% for profile in state.userprofile_set.all %}
+                        {% include 'permissions_tool/audit_row.html' with type="Group" name=group%}
-                    {% with profile.user as user %}
+                    {% endfor %}
-                        <tr>
-                            {% include 'permissions_tool/audit_state_row.html' %}
-                        </tr>
-                    {% endwith %}
                 {% endfor %}
-            {% endfor %}
+                {% for state in permission.states %}
-            </tbody>
+                    {% for profile in state.userprofile_set.all %}
-        </table>
+                        {% 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>
+    <td>        
-        {% if forloop.first %}
+        {{ type }}: {{ name }}
-            <b>{{ group }}</b>
+    </td>
-        {% endif %}
+    <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' %}
+        <p>
-            <span class="pull-right">
+        {% if request.GET.all != 'yes' %}            
-                {% blocktrans %}Showing only applied permissions{% endblocktrans %}
+            {% blocktrans %}Showing only applied permissions{% endblocktrans %}
-                <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% trans "Show All" %}</a>
+            <a href="{% url 'permissions_tool:overview' %}?all=yes" class="btn btn-primary">{% trans "Show All" %}</a>            
-            </span>
         {% else %}
-            <span class="pull-right">
+            {% blocktrans %}Showing all permissions{% endblocktrans %}
-                {% blocktrans %}Showing all permissions{% endblocktrans %}
+            <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% trans "Show Applied" %}</a>
-                <a href="{% url 'permissions_tool:overview' %}?all=no" class="btn btn-primary">{% trans "Show Applied" %}</a>
-            </span>
         {% endif %}
-        <table class="table table-hover">
+        </p>
-            <thead>
+        <div class="table-responsive">
-                <tr>
+            <table class="table table-striped" id="tab_permissions_overview" style="width:100%">
-                    <th>
+                <thead>
-                        {% trans "App" %}
+                    <tr>
-                    </th>
+                        <th>
-                    <th>
+                            {% trans "App" %}
-                        {% trans "Model" %}
+                        </th>
-                    </th>
+                        <th>
-                    <th>
+                            {% trans "Model" %}
-                        {% trans "Code Name" %}
+                        </th>
-                    </th>
+                        <th>
-                    <th>
+                            {% trans "Code Name" %}
-                        {% trans "Name" %}
+                        </th>
-                    </th>
+                        <th>
-                    <th class="col-md-1">
+                            {% trans "Name" %}
-                        {% trans "Users" %}
+                        </th>
-                    </th>
+                        <th class="col-md-1">
-                    <th class="col-md-1">
+                            {% trans "Users" %}
-                        {% trans "Groups" %}
+                        </th>
-                    </th>
+                        <th class="col-md-1">
-                    <th class="col-md-1">
+                            {% trans "Groups" %}
-                        {% trans "States" %}
+                        </th>
-                    </th>
+                        <th class="col-md-1">
-                </tr>
+                            {% trans "States" %}
-            </thead>
+                        </th>
-            <tbody>
+                    </tr>
-            {% for perm in permissions %}
+                </thead>
-                <tr>
+                <tbody>
-                    <td>
+                {% for perm in permissions %}
-                        {{ perm.permission.content_type.app_label }}
+                    <tr>
-                    </td>
+                        <td>
-                    <td>
+                            {{ perm.permission.content_type.app_label }}
-                        {{ perm.permission.content_type.model }}
+                        </td>
-                    </td>
+                        <td>
-                    <td>
+                            {{ perm.permission.content_type.model }}
-                        <a href="{% url "permissions_tool:audit" app_label=perm.permission.content_type.app_label model=perm.permission.content_type.model codename=perm.permission.codename %}">
+                        </td>
-                            {{ perm.permission.codename }}
+                        <td>
-                        </a>
+                            <a href="{% url "permissions_tool:audit" app_label=perm.permission.content_type.app_label model=perm.permission.content_type.model codename=perm.permission.codename %}">
-                    </td>
+                                {{ perm.permission.codename }}
-                    <td>
+                            </a>
-                        {{ perm.permission.name }}
+                        </td>
-                    </td>
+                        <td>
-                    <td class="{% if perm.users > 0 %}info {% endif %}text-right">
+                            {{ perm.permission.name }}
-                        {{ perm.users }}
+                        </td>
-                    </td>
+                        <td class="{% if perm.users > 0 %}info {% endif %}text-right">
-                    <td class="{% if perm.groups > 0 %}info {% endif %}text-right">
+                            {{ perm.users }}
-                        {{ perm.groups }} ({{ perm.group_users }})
+                        </td>
-                    </td>
+                        <td class="{% if perm.groups > 0 %}info {% endif %}text-right">
-                    <td class="{% if perm.states > 0 %}info {% endif %}text-right">
+                            {{ perm.groups }} ({{ perm.group_users }})
-                        {{ perm.states }} ({{ perm.state_users }})
+                        </td>
-                    </td>
+                        <td class="{% if perm.states > 0 %}info {% endif %}text-right">
-                </tr>
+                            {{ perm.states }} ({{ perm.state_users }})
-            {% endfor %}
+                        </td>
-            </tbody>
+                    </tr>
-        </table>
+                {% 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/services/admin.py

@@ -1,9 +1,50 @@
-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', 
+        'uid'
+    )
+    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/modules/discord/admin.py

@@ -1,9 +1,18 @@
 from django.contrib import admin
+
 from .models import DiscordUser
+from ...admin import ServicesUserAdmin
 
 
-class DiscordUserAdmin(admin.ModelAdmin):
+@admin.register(DiscordUser)
-        list_display = ('user', 'uid')
+class DiscordUserAdmin(ServicesUserAdmin):            
-        search_fields = ('user__username', 'uid')
+    list_display = ServicesUserAdmin.list_display + (        
+        '_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.test import TestCase
-from django.contrib.auth.models import User, Group, Permission
-from django.core.exceptions import ObjectDoesNotExist
 from django.conf import settings
-from allianceauth.tests.auth_utils import AuthUtils
 
-from .auth_hooks import DiscordService
+from ..manager import DiscordOAuthManager
-from .models import DiscordUser
+from .. import manager
-from .tasks import DiscordTasks
-from .manager import DiscordOAuthManager
-from . import manager
 
-
+from . import DEFAULT_AUTH_GROUP, add_permissions, MODULE_PATH
-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
 
 
 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/discourse/admin.py

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

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):
+@admin.register(MumbleUser)
-        fields = ('user', 'username', 'groups')  # pwhash is hidden from admin panel
+class MumbleUserAdmin(ServicesUserAdmin):            
-        list_display = ('user', 'username', 'groups')
+    list_display = ServicesUserAdmin.list_display + (        
-        search_fields = ('user__username', 'username', 'groups')
+        '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):
+@admin.register(OpenfireUser)
-        list_display = ('user', 'username')
+class OpenfireUserAdmin(ServicesUserAdmin):
-        search_fields = ('user__username', 'username')
+    list_display = ServicesUserAdmin.list_display + ('username',)         
+    search_fields = ServicesUserAdmin.search_fields + ('username', )
 
-admin.site.register(OpenfireUser, OpenfireUserAdmin)

allianceauth/services/modules/openfire/views.py

@@ -25,7 +25,7 @@ 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)

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):
+@admin.register(Phpbb3User)
-        list_display = ('user', 'username')
+class Phpbb3UserAdmin(ServicesUserAdmin):
-        search_fields = ('user__username', 'username')
+    list_display = ServicesUserAdmin.list_display + ('username',)         
-
+    search_fields = ServicesUserAdmin.search_fields + ('username', )
-admin.site.register(Phpbb3User, Phpbb3UserAdmin)

allianceauth/services/modules/seat/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'allianceauth.services.modules.seat.apps.SeatServiceConfig'

allianceauth/services/modules/seat/admin.py

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

allianceauth/services/modules/seat/apps.py

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

allianceauth/services/modules/seat/auth_hooks.py

@@ -1,64 +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 SeatTasks
-from .urls import urlpatterns
-
-logger = logging.getLogger(__name__)
-
-
-class SeatService(ServicesHook):
-    def __init__(self):
-        ServicesHook.__init__(self)
-        self.urlpatterns = urlpatterns
-        self.name = 'seat'
-        self.service_url = settings.SEAT_URL
-        self.access_perm = 'seat.access_seat'
-        self.name_format = '{character_name}'
-
-    @property
-    def title(self):
-        return "SeAT"
-
-    def delete_user(self, user, notify_user=False):
-        logger.debug('Deleting user %s %s account' % (user, self.name))
-        return SeatTasks.delete_user(user, notify_user=notify_user)
-
-    def validate_user(self, user):
-        logger.debug('Validating user %s %s account' % (user, self.name))
-        if SeatTasks.has_account(user) and not self.service_active_for_user(user):
-            self.delete_user(user)
-
-    def update_groups(self, user):
-        logger.debug("Updating %s groups for %s" % (self.name, user))
-        if SeatTasks.has_account(user):
-            SeatTasks.update_roles.delay(user.pk)
-
-    def update_all_groups(self):
-        logger.debug('Update all %s groups called' % self.name)
-        SeatTasks.update_all_roles.delay()
-
-    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 = 'seat:activate'
-        urls.auth_deactivate = 'seat:deactivate'
-        urls.auth_reset_password = 'seat:reset_password'
-        urls.auth_set_password = 'seat:set_password'
-        return render_to_string(self.service_ctrl_template, {
-            'service_name': self.title,
-            'urls': urls,
-            'service_url': self.service_url,
-            'username': request.user.seat.username if SeatTasks.has_account(request.user) else ''
-        }, request=request)
-
-
-@hooks.register('services_hook')
-def register_service():
-    return SeatService()

allianceauth/services/modules/seat/manager.py

@@ -1,204 +0,0 @@
-import hashlib
-import logging
-import random
-import string
-
-import requests
-from django.conf import settings
-
-logger = logging.getLogger(__name__)
-
-
-class SeatManager:
-    def __init__(self):
-        pass
-
-    RESPONSE_OK = 'ok'
-
-    @staticmethod
-    def __sanitize_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)])
-
-    @classmethod
-    def _response_ok(cls, response):
-        return cls.RESPONSE_OK in response
-
-    @staticmethod
-    def exec_request(endpoint, func, raise_for_status=False, **kwargs):
-        """ Send an https api request """
-        try:
-            endpoint = '{0}/api/v1/{1}'.format(settings.SEAT_URL, endpoint)
-            headers = {'X-Token': settings.SEAT_XTOKEN, 'Accept': 'application/json'}
-            logger.debug(headers)
-            logger.debug(endpoint)
-            ret = getattr(requests, func)(endpoint, headers=headers, data=kwargs)
-            ret.raise_for_status()
-            return ret.json()
-        except requests.HTTPError as e:
-            if raise_for_status:
-                raise e
-            logger.exception("Error encountered while performing API request to SeAT with url {}".format(endpoint))
-            return {}
-
-    @classmethod
-    def add_user(cls, username, email):
-        """ Add user to service """
-        sanitized = str(cls.__sanitize_username(username))
-        logger.debug("Adding user to SeAT with username %s" % sanitized)
-        password = cls.__generate_random_pass()
-        ret = cls.exec_request('user', 'post', username=sanitized, email=str(email), password=password)
-        logger.debug(ret)
-        if cls._response_ok(ret):
-            logger.info("Added SeAT user with username %s" % sanitized)
-            return sanitized, password
-        logger.info("Failed to add SeAT user with username %s" % sanitized)
-        return None, None
-
-    @classmethod
-    def delete_user(cls, username):
-        """ Delete user """
-        ret = cls.exec_request('user/{}'.format(username), 'delete')
-        logger.debug(ret)
-        if cls._response_ok(ret):
-            logger.info("Deleted SeAT user with username %s" % username)
-            return username
-        return None
-
-    @classmethod
-    def enable_user(cls, username):
-        """ Enable user """
-        ret = cls.exec_request('user/{}'.format(username), 'put', account_status=1)
-        logger.debug(ret)
-        if cls._response_ok(ret):
-            logger.info("Enabled SeAT user with username %s" % username)
-            return username
-        logger.info("Failed to enabled SeAT user with username %s" % username)
-        return None
-
-    @classmethod
-    def disable_user(cls, username):
-        """ Disable user """
-        cls.update_roles(username, [])
-        ret = cls.exec_request('user/{}'.format(username), 'put', account_status=0)
-        logger.debug(ret)
-        if cls._response_ok(ret):
-            logger.info("Disabled SeAT user with username %s" % username)
-            return username
-        logger.info("Failed to disable SeAT user with username %s" % username)
-        return None
-
-    @classmethod
-    def _check_email_changed(cls, username, email):
-        """Compares email to one set on SeAT"""
-        ret = cls.exec_request('user/{}'.format(username), 'get', raise_for_status=True)
-        return ret['email'] != email
-
-    @classmethod
-    def update_user(cls, username, email, password):
-        """ Edit user info """
-        if cls._check_email_changed(username, email):
-            # if we try to set the email to whatever it is already on SeAT, we get a HTTP422 error
-            logger.debug("Updating SeAT username %s with email %s and password" % (username, email))
-            ret = cls.exec_request('user/{}'.format(username), 'put', email=email)
-            logger.debug(ret)
-            if not cls._response_ok(ret):
-                logger.warn("Failed to update email for username {}".format(username))
-        ret = cls.exec_request('user/{}'.format(username), 'put', password=password)
-        logger.debug(ret)
-        if not cls._response_ok(ret):
-            logger.warn("Failed to update password for username {}".format(username))
-            return None
-        logger.info("Updated SeAT user with username %s" % username)
-        return username
-
-    @classmethod
-    def update_user_password(cls, username, email, plain_password=None):
-        logger.debug("Settings new SeAT password for user %s" % username)
-        if not plain_password:
-            plain_password = cls.__generate_random_pass()
-        if cls.update_user(username, email, plain_password):
-            return plain_password
-
-    @classmethod
-    def check_user_status(cls, username):
-        sanitized = str(cls.__sanitize_username(username))
-        logger.debug("Checking SeAT status for user %s" % sanitized)
-        ret = cls.exec_request('user/{}'.format(sanitized), 'get')
-        logger.debug(ret)
-        return ret
-
-    @classmethod
-    def get_all_seat_eveapis(cls):
-        seat_all_keys = cls.exec_request('key', 'get')
-        seat_keys = {}
-        for key in seat_all_keys:
-            try:
-                seat_keys[key["key_id"]] = key["user_id"]
-            except KeyError:
-                seat_keys[key["key_id"]] = None
-        return seat_keys
-
-    @classmethod
-    def get_all_roles(cls):
-        groups = {}
-        ret = cls.exec_request('role', 'get')
-        logger.debug(ret)
-        for group in ret:
-            groups[group["title"]] = group["id"]
-        logger.debug("Retrieved role list from SeAT: %s" % str(groups))
-        return groups
-
-    @classmethod
-    def add_role(cls, role):
-        ret = cls.exec_request('role/new', 'post', name=role)
-        logger.debug(ret)
-        logger.info("Added Seat group %s" % role)
-        role_info = cls.exec_request('role/detail/{}'.format(role), 'get')
-        logger.debug(role_info)
-        return role_info["id"]
-
-    @classmethod
-    def add_role_to_user(cls, user_id, role_id):
-        ret = cls.exec_request('role/grant-user-role/{}/{}'.format(user_id, role_id), 'get')
-        logger.info("Added role %s to user %s" % (role_id, user_id))
-        return ret
-
-    @classmethod
-    def revoke_role_from_user(cls, user_id, role_id):
-        ret = cls.exec_request('role/revoke-user-role/{}/{}'.format(user_id, role_id), 'get')
-        logger.info("Revoked role %s from user %s" % (role_id, user_id))
-        return ret
-
-    @classmethod
-    def update_roles(cls, seat_user, roles):
-        logger.debug("Updating SeAT user %s with roles %s" % (seat_user, roles))
-        user_info = cls.check_user_status(seat_user)
-        user_roles = {}
-        if type(user_info["roles"]) is list:
-            for role in user_info["roles"]:
-                user_roles[role["title"]] = role["id"]
-        logger.debug("Got user %s SeAT roles %s" % (seat_user, user_roles))
-        seat_roles = cls.get_all_roles()
-        addroles = set(roles) - set(user_roles.keys())
-        remroles = set(user_roles.keys()) - set(roles)
-
-        logger.info("Updating SeAT roles for user %s - adding %s, removing %s" % (seat_user, addroles, remroles))
-        for r in addroles:
-            if r not in seat_roles:
-                seat_roles[r] = cls.add_role(r)
-            logger.debug("Adding role %s to SeAT user %s" % (r, seat_user))
-            cls.add_role_to_user(user_info["id"], seat_roles[r])
-        for r in remroles:
-            logger.debug("Removing role %s from user %s" % (r, seat_user))
-            cls.revoke_role_from_user(user_info["id"], seat_roles[r])
-
-    @staticmethod
-    def username_hash(username):
-        m = hashlib.sha1()
-        m.update(username.encode('utf-8'))
-        return m.hexdigest()

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

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.4 on 2017-01-15 07:06
-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='SeatUser',
-            fields=[
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='seat', serialize=False, to=settings.AUTH_USER_MODEL)),
-                ('username', models.CharField(max_length=254)),
-            ],
-        ),
-    ]

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

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-02-02 10:49
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('seat', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='seatuser',
-            options={'permissions': (('access_seat', 'Can access the SeAT service'),)},
-        ),
-    ]

allianceauth/services/modules/seat/models.py

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

allianceauth/services/modules/seat/tasks.py

@@ -1,69 +0,0 @@
-import logging
-
-from django.contrib.auth.models import User
-from django.core.exceptions import ObjectDoesNotExist
-from celery import shared_task
-from allianceauth.services.tasks import QueueOnce
-from allianceauth.notifications import notify
-from allianceauth.services.hooks import NameFormatter
-from .manager import SeatManager
-from .models import SeatUser
-
-logger = logging.getLogger(__name__)
-
-
-class SeatTasks:
-    def __init__(self):
-        pass
-
-    @staticmethod
-    def has_account(user):
-        try:
-            return user.seat.username != ''
-        except ObjectDoesNotExist:
-            return False
-
-    @classmethod
-    def delete_user(cls, user, notify_user=False):
-        if cls.has_account(user) and SeatManager.disable_user(user.seat.username):
-            user.seat.delete()
-            logger.info("Successfully deactivated SeAT for user %s" % user)
-            if notify_user:
-                notify(user, 'SeAT Account Disabled', level='danger')
-            return True
-        return False
-
-    @staticmethod
-    @shared_task(bind=True, name='seat.update_roles', base=QueueOnce)
-    def update_roles(self, pk):
-        user = User.objects.get(pk=pk)
-        logger.debug("Updating SeAT roles for user %s" % user)
-        if SeatTasks.has_account(user):
-            groups = [user.profile.state.name]
-            for group in user.groups.all():
-                groups.append(str(group.name))
-            logger.debug("Updating user %s SeAT roles to %s" % (user, groups))
-            try:
-                SeatManager.update_roles(user.seat.username, groups)
-            except:
-                logger.warn("SeAT group sync failed for %s, retrying in 10 mins" % user, exc_info=True)
-                raise self.retry(countdown=60 * 10)
-            logger.debug("Updated user %s SeAT roles." % user)
-        else:
-            logger.debug("User %s does not have a SeAT account")
-
-    @staticmethod
-    @shared_task
-    def update_all_roles():
-        logger.debug("Updating ALL SeAT roles")
-        for user in SeatUser.objects.all():
-            SeatTasks.update_roles.delay(user.user_id)
-
-    @staticmethod
-    def deactivate():
-        SeatUser.objects.all().delete()
-
-    @staticmethod
-    def get_username(user):
-        from .auth_hooks import SeatService
-        return NameFormatter(SeatService(), user).format_name()

allianceauth/services/modules/seat/tests.py

@@ -1,204 +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 SeatService
-from .models import SeatUser
-from .tasks import SeatTasks
-
-MODULE_PATH = 'allianceauth.services.modules.seat'
-DEFAULT_AUTH_GROUP = 'Member'
-
-
-def add_permissions():
-    permission = Permission.objects.get(codename='access_seat')
-    members = Group.objects.get_or_create(name=DEFAULT_AUTH_GROUP)[0]
-    AuthUtils.add_permissions_to_groups([permission], [members])
-
-
-class SeatHooksTestCase(TestCase):
-    def setUp(self):
-        self.member = 'member_user'
-        member = AuthUtils.create_member(self.member)
-        SeatUser.objects.create(user=member, username=self.member)
-        self.none_user = 'none_user'
-        none_user = AuthUtils.create_user(self.none_user, disconnect_signals=True)
-        self.service = SeatService
-        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(SeatTasks.has_account(member))
-        self.assertFalse(SeatTasks.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.SeatManager')
-    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_roles.called)
-        self.assertEqual(manager.update_roles.call_count, 1)
-
-    def test_update_groups(self):
-        # Check member has Member group updated
-        with mock.patch(MODULE_PATH + '.tasks.SeatManager') as manager:
-            service = self.service()
-            member = User.objects.get(username=self.member)
-            service.update_groups(member)
-            self.assertTrue(manager.update_roles.called)
-            args, kwargs = manager.update_roles.call_args
-            user_id, groups = args
-            self.assertIn(DEFAULT_AUTH_GROUP, groups)
-            self.assertEqual(user_id, member.seat.username)
-
-        # Check none user does not have groups updated
-        with mock.patch(MODULE_PATH + '.tasks.SeatManager') as manager:
-            service = self.service()
-            none_user = User.objects.get(username=self.none_user)
-            service.update_groups(none_user)
-            self.assertFalse(manager.update_roles.called)
-
-    @mock.patch(MODULE_PATH + '.tasks.SeatManager')
-    def test_validate_user(self, manager):
-        service = self.service()
-        # Test member is not deleted
-        member = User.objects.get(username=self.member)
-        # Pre assertion
-        self.assertTrue(member.has_perm('seat.access_seat'))
-
-        service.validate_user(member)
-        self.assertTrue(User.objects.get(username=self.member).seat)
-
-        # Test none user is deleted
-        none_user = User.objects.get(username=self.none_user)
-        manager.disable_user.return_value = 'abc123'
-        SeatUser.objects.create(user=none_user, username='abc123')
-        service.validate_user(none_user)
-        self.assertTrue(manager.disable_user.called)
-        with self.assertRaises(ObjectDoesNotExist):
-            none_seat = User.objects.get(username=self.none_user).seat
-
-    @mock.patch(MODULE_PATH + '.tasks.SeatManager')
-    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):
-            seat_user = User.objects.get(username=self.member).seat
-
-    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('seat:deactivate'), response)
-        self.assertIn(urls.reverse('seat:reset_password'), response)
-        self.assertIn(urls.reverse('seat:set_password'), response)
-
-        # Test register becomes available
-        member.seat.delete()
-        member = User.objects.get(username=self.member)
-        request.user = member
-        response = service.render_services_ctrl(request)
-        self.assertIn(urls.reverse('seat:activate'), response)
-
-
-class SeatViewsTestCase(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 + '.tasks.SeatManager')
-    @mock.patch(MODULE_PATH + '.views.SeatManager')
-    def test_activate(self, manager, tasks_manager):
-        self.login()
-        expected_username = 'auth_member'
-        manager.check_user_status.return_value = {}
-        manager.add_user.return_value = (expected_username, 'abc123')
-
-        response = self.client.get(urls.reverse('seat:activate'))
-
-        self.assertTrue(manager.add_user.called)
-        self.assertTrue(tasks_manager.update_roles.called)
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed('services/service_credentials.html')
-        self.assertContains(response, expected_username)
-        seat_user = SeatUser.objects.get(user=self.member)
-        self.assertEqual(seat_user.username, expected_username)
-
-    @mock.patch(MODULE_PATH + '.tasks.SeatManager')
-    def test_deactivate(self, manager):
-        self.login()
-        SeatUser.objects.create(user=self.member, username='some member')
-
-        response = self.client.get(urls.reverse('seat:deactivate'))
-
-        self.assertTrue(manager.disable_user.called)
-        self.assertRedirects(response, expected_url=urls.reverse('services:services'), target_status_code=200)
-
-        with self.assertRaises(ObjectDoesNotExist):
-            seat_user = User.objects.get(pk=self.member.pk).seat
-
-    @mock.patch(MODULE_PATH + '.views.SeatManager')
-    def test_set_password(self, manager):
-        self.login()
-        SeatUser.objects.create(user=self.member, username='some member')
-
-        response = self.client.post(urls.reverse('seat:set_password'), data={'password': '1234asdf'})
-
-        self.assertTrue(manager.update_user_password.called)
-        args, kwargs = manager.update_user_password.call_args
-        self.assertEqual(kwargs['plain_password'], '1234asdf')
-        self.assertRedirects(response, expected_url=urls.reverse('services:services'), target_status_code=200)
-
-    @mock.patch(MODULE_PATH + '.views.SeatManager')
-    def test_reset_password(self, manager):
-        self.login()
-        SeatUser.objects.create(user=self.member, username='some member')
-
-        manager.update_user_password.return_value = 'hunter2'
-
-        response = self.client.get(urls.reverse('seat:reset_password'))
-
-        self.assertTemplateUsed(response, 'services/service_credentials.html')
-        self.assertContains(response, 'some member')
-        self.assertContains(response, 'hunter2')
-
-
-class SeatManagerTestCase(TestCase):
-    def setUp(self):
-        from .manager import SeatManager
-        self.manager = SeatManager
-
-    def test_generate_random_password(self):
-        password = self.manager._SeatManager__generate_random_pass()
-
-        self.assertEqual(len(password), 16)
-        self.assertIsInstance(password, type(''))

allianceauth/services/modules/seat/urls.py

@@ -1,17 +0,0 @@
-from django.conf.urls import url, include
-
-from . import views
-
-app_name='seat'
-
-module_urls = [
-    # SeAT Service Control
-    url(r'^activate/$', views.activate_seat, name='activate'),
-    url(r'^deactivate/$', views.deactivate_seat, name='deactivate'),
-    url(r'^reset_password/$', views.reset_seat_password, name='reset_password'),
-    url(r'^set_password/$', views.set_seat_password, name='set_password'),
-]
-
-urlpatterns = [
-    url(r'^seat/', include((module_urls, app_name), namespace=app_name)),
-]

allianceauth/services/modules/seat/views.py

@@ -1,130 +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 django.utils.translation import ugettext_lazy as _
-
-from allianceauth.services.forms import ServicePasswordForm
-from .manager import SeatManager
-from .models import SeatUser
-from .tasks import SeatTasks
-
-logger = logging.getLogger(__name__)
-
-ACCESS_PERM = 'seat.access_seat'
-SERVICE_NAME = {'service': 'SeAT'}
-
-
-@login_required
-@permission_required(ACCESS_PERM)
-def activate_seat(request):
-    logger.debug("activate_seat called by user %s" % request.user)
-    character = request.user.profile.main_character
-    logger.debug("Checking SeAT for inactive users with the same username")
-    stat = SeatManager.check_user_status(character.character_name)
-    if stat == {}:
-        logger.debug("User not found, adding SeAT user for user %s with main character %s" % (request.user, character))
-        result = SeatManager.add_user(SeatTasks.get_username(request.user), request.user.email)
-    else:
-        logger.debug("User found, resetting password")
-        username = SeatManager.enable_user(stat["name"])
-        password = SeatManager.update_user_password(username, request.user.email)
-        result = [username, password]
-    # if empty we failed
-    if result[0] and result[1]:
-        SeatUser.objects.update_or_create(user=request.user, defaults={'username': result[0]})
-        logger.debug("Updated SeatUser for user %s with SeAT credentials. Adding eve-apis..." % request.user)
-        SeatTasks.update_roles.delay(request.user.pk)
-        logger.info("Successfully activated SeAT for user %s" % request.user)
-        messages.add_message(request, messages.SUCCESS, _('Successfully activated your %(service)s account.') %
-                             SERVICE_NAME)
-        credentials = {
-            'username': request.user.seat.username,
-            'password': result[1],
-        }
-        return render(request, 'services/service_credentials.html',
-                      context={'credentials': credentials, 'service': 'SeAT'})
-    messages.add_message(request, messages.ERROR,
-                         _('Failed to activate your %(service)s account, please contact your administrator.') %
-                         SERVICE_NAME)
-    logger.error("Unsuccessful attempt to activate seat for user %s" % request.user)
-    return redirect("services:services")
-
-
-@login_required
-@permission_required(ACCESS_PERM)
-def deactivate_seat(request):
-    logger.debug("deactivate_seat called by user %s" % request.user)
-    # false we failed
-    if SeatTasks.delete_user(request.user):
-        messages.add_message(request, messages.SUCCESS,
-                             _('Successfully deactivated your %(service)s account.') % SERVICE_NAME)
-        logger.info("Successfully deactivated SeAT for user %s" % request.user)
-        return redirect("services:services")
-    else:
-        logging.error("User does not have a SeAT account")
-    messages.add_message(request, messages.ERROR,
-                         _('Failed to deactivate your %(service)s account, please contact your administrator.') %
-                         SERVICE_NAME)
-    logger.error("Unsuccessful attempt to activate SeAT for user %s" % request.user)
-    return redirect("services:services")
-
-
-@login_required
-@permission_required(ACCESS_PERM)
-def reset_seat_password(request):
-    logger.debug("reset_seat_password called by user %s" % request.user)
-    if SeatTasks.has_account(request.user):
-        result = SeatManager.update_user_password(request.user.seat.username, request.user.email)
-        # false we failed
-        if result:
-            credentials = {
-                'username': request.user.seat.username,
-                'password': result,
-            }
-            messages.add_message(request, messages.SUCCESS,
-                                 _('Successfully reset your %(service)s password.') % {'service': 'SeAT'})
-            logger.info("Succesfully reset SeAT password for user %s" % request.user)
-            return render(request, 'services/service_credentials.html',
-                          context={'credentials': credentials, 'service': 'SeAT'})
-    logger.error("Unsuccessful attempt to reset SeAT password for user %s" % request.user)
-    messages.add_message(request, messages.ERROR,
-                         _('Failed to reset your %(service)s password, please contact your administrator.') %
-                         {'service': 'SeAT'})
-    return redirect("services:services")
-
-
-@login_required
-@permission_required(ACCESS_PERM)
-def set_seat_password(request):
-    logger.debug("set_seat_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 SeatTasks.has_account(request.user):
-            password = form.cleaned_data['password']
-            logger.debug("Form contains password of length %s" % len(password))
-            result = SeatManager.update_user_password(request.user.seat.username,
-                                                      request.user.email,
-                                                      plain_password=password)
-            if result:
-                messages.add_message(request, messages.SUCCESS,
-                                     _('Successfully set your %(service)s password.') % SERVICE_NAME)
-                logger.info("Succesfully reset SeAT password for user %s" % request.user)
-                return redirect("services:services")
-            else:
-                messages.add_message(request, messages.ERROR,
-                                     _('Failed to set your %(service)s password, please contact your administrator.') %
-                                     SERVICE_NAME)
-                logger.error("Failed to install custom SeAT password for user %s" % request.user)
-        else:
-            messages.add_message(request, messages.ERROR, _('Invalid password.'))
-            logger.error("Invalid SeAT password provided")
-    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': 'SeAT'}
-    return render(request, 'services/service_password.html', context)

allianceauth/services/modules/smf/admin.py

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

allianceauth/services/modules/teamspeak3/admin.py

@@ -1,22 +1,36 @@
 from django.contrib import admin
+
 from .models import AuthTS, Teamspeak3User, StateGroup
+from ...admin import ServicesUserAdmin
 
 
-class Teamspeak3UserAdmin(admin.ModelAdmin):
+@admin.register(Teamspeak3User)
-        list_display = ('user', 'uid', 'perm_key')
+class Teamspeak3UserAdmin(ServicesUserAdmin):    
-        search_fields = ('user__username', 'uid', 'perm_key')
+    list_display = ServicesUserAdmin.list_display + (        
-
+        'uid',
+        'perm_key'        
+    )
+    
 
+@admin.register(AuthTS)
 class AuthTSgroupAdmin(admin.ModelAdmin):
-    fields = ['auth_group', 'ts_group']
+    ordering = ('auth_group__name', )
+    list_select_related = True  
+    
+    list_display = ('auth_group', '_ts_group')
+    list_filter = ('ts_group', )
+    
+    fields = ('auth_group', 'ts_group')
     filter_horizontal = ('ts_group',)
 
+    def _ts_group(self, obj):
+        return [x for x in obj.ts_group.all().order_by('ts_group_id')]
+    
+    _ts_group.short_description = 'ts groups'
+    #_ts_group.admin_order_field = 'profile__state'
+
 
 @admin.register(StateGroup)
 class StateGroupAdmin(admin.ModelAdmin):
     list_display = ('state', 'ts_group')
     search_fields = ('state__name', 'ts_group__ts_group_name')
-
-
-admin.site.register(AuthTS, AuthTSgroupAdmin)
-admin.site.register(Teamspeak3User, Teamspeak3UserAdmin)

allianceauth/services/modules/teamspeak3/views.py

@@ -25,7 +25,7 @@ def activate_teamspeak3(request):
         result = ts3man.add_user(request.user, Teamspeak3Tasks.get_username(request.user))
 
     # if its empty we failed
-    if result[0] is not "":
+    if result[0] != "":
         Teamspeak3User.objects.update_or_create(user=request.user, defaults={'uid': result[0], 'perm_key': result[1]})
         logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
         logger.info("Successfully activated TS3 for user %s" % request.user)

allianceauth/services/modules/xenforo/admin.py

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

allianceauth/services/static/services/admin.css

@@ -0,0 +1,6 @@
+/* 
+CSS for allianceauth admin site 
+*/
+
+.img-circle { border-radius: 50%; }
+.column-user_profile_pic { width: 50px; }

allianceauth/services/templates/services/services.html

@@ -8,17 +8,23 @@
 {% block content %}
     <div class="col-lg-12">
     <h1 class="page-header text-center">{% trans "Available Services" %}</h1>
-        <table class="table table-hover">
+        <div class="table-responsive">
-            <tr>
+            <table class="table table-striped">
-                <th class="text-center">{% trans "Service" %}</th>
+                <thead>
-                <th class="text-center">{% trans "Username" %}</th>
+                    <tr>
-                <th class="text-center">{% trans "Domain" %}</th>
+                        <th class="text-center">{% trans "Service" %}</th>
-                <th class="text-center">{% trans "Action" %}</th>
+                        <th class="text-center">{% trans "Username" %}</th>
-            </tr>
+                        <th class="text-center">{% trans "Domain" %}</th>
-            {% for svc in service_ctrls %}
+                        <th class="text-center">{% trans "Action" %}</th>
-                {{ svc }}
+                    </tr>
-            {% endfor %}
+                </thead>
-        </table>
+                <tbody>
+                    {% for svc in service_ctrls %}
+                        {{ svc }}
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
     </div>
 
 {% endblock content %}

allianceauth/srp/templates/srp/data.html

@@ -62,104 +62,107 @@
             </h1>
             
             {% if srpfleetrequests %}
-            <form method="POST">
+                <form method="POST">
-                {% csrf_token %}
+                    {% csrf_token %}
-                <div class="alert alert-info" role="alert">
+                    <div class="alert alert-info" role="alert">
-                    <div class="text-right">
+                        <div class="text-right">
-                        <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
+                            <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
-                        <b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                            <b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
-                        {% if perms.auth.srp_management %}
-                            <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
-                                <span class="glyphicon glyphicon-ok"></span>
-                            </button>
-                            <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
-                                <span class="glyphicon glyphicon-remove"></span>
-                            </button>
-                            <button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
-                                <span class="glyphicon glyphicon-trash"></span>
-                            </button>
-                        {% endif %}
-                    </div>
-                </div>
-            
-                <table class="table">
-                    <tr>
-                        <th class="text-center">{% trans "Pilot Name" %}</th>
-                        <th class="text-center">{% trans "Killboard Link" %}</th>
-                        <th class="text-center">{% trans "Additional Info" %}</th>
-                        <th class="text-center">{% trans "Ship Type" %}</th>
-                        <th class="text-center">{% trans "Killboard Loss Amt" %}</th>
-                        <th class="text-center">{% trans "SRP ISK Cost" %}
-                        {% blocktrans %}<i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Click value to edit
-Enter to save&next
-ESC to cancel"
-                        id="blah"></i></th>{% endblocktrans %}
-                        <th class="text-center">{% trans "Post Time" %}</th>
-                        <th class="text-center">{% trans "Status" %}</th>
-                        {% if perms.auth.srp_management %}
-                            <th class="text-center">{% trans "Actions" %}</th>
-                        {% endif %}
-                    </tr>
-                    {% for srpfleetrequest in srpfleetrequests %}
-                        <tr>
-                            <td class="text-center">{{ srpfleetrequest.character.character_name }}</td>
-                            <td class="text-center">
-                                <a href="{{ srpfleetrequest.killboard_link }}"
-                                   target="_blank" class="label label-warning">Link</a>
-                            </td>
-                            <td class="text-center">{{ srpfleetrequest.additional_info }}</td>
-                            <td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
-                            <td class="text-center">{{ srpfleetrequest.kb_total_loss | intcomma }} ISK</td>
-                            <td class="srp" data-name="srp_total_amount" data-type="number" data-pk="{{srpfleetrequest.id}}" data-url="{% url 'srp:request_update_amount' srpfleetrequest.id %}" data-params="{csrfmiddlewaretoken:'{{csrf_token}}'}" class="text-center">{{ srpfleetrequest.srp_total_amount | intcomma }} ISK</td>
-                            <td class="text-center">{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}</td>
-                            <td class="text-center">
-                                {% if srpfleetrequest.srp_status == "Approved" %}
-                                    <div class="label label-success">
-                                        {% trans "Approved" %}
-                                    </div>
-                                {% elif srpfleetrequest.srp_status == "Rejected" %}
-                                    <div class="label label-danger">
-                                        {% trans "Rejected" %}
-                                    </div>
-                                {% else %}
-                                    <div class="label label-warning">
-                                        {% trans "Pending" %}
-                                    </div>
-                                {% endif %}
-                            </td>
                             {% if perms.auth.srp_management %}
-                                <td class="text-center">
+                                <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
-                                    <div class="checkbox">
+                                    <span class="glyphicon glyphicon-ok"></span>
-                                        <label style="font-size: 1.5em">
+                                </button>
-                                            <input type="checkbox" name="{{srpfleetrequest.id}}">
+                                <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
-                                            <span class="cr"><i class="cr-icon fa fa-check"></i></span>
+                                    <span class="glyphicon glyphicon-remove"></span>
-                                        </label>
+                                </button>
-                                    </div>                            
+                                <button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
-                                </td>
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
                             {% endif %}
-                        </tr>
+                        </div>
-                    {% endfor %}   
-                </table>
-                <div class="alert alert-info" role="alert">
-                    <div class="text-right">
-                        <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
-                        <b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
-                        {% if perms.auth.srp_management %}
-                            <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
-                                <span class="glyphicon glyphicon-ok"></span>
-                            </button>
-                            <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
-                                <span class="glyphicon glyphicon-remove"></span>
-                            </button>
-                            <button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
-                                <span class="glyphicon glyphicon-trash"></span>
-                            </button>
-                        {% endif %}
                     </div>
-                </div>
+                    <div class="table-responsive">
-            </form>
+                        <table class="table">
+                            <tr>
+                                <th class="text-center">{% trans "Pilot Name" %}</th>
+                                <th class="text-center">{% trans "Killboard Link" %}</th>
+                                <th class="text-center">{% trans "Additional Info" %}</th>
+                                <th class="text-center">{% trans "Ship Type" %}</th>
+                                <th class="text-center">{% trans "Killboard Loss Amt" %}</th>
+                                <th class="text-center">{% trans "SRP ISK Cost" %}
+                                {% blocktrans %}<i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Click value to edit
+        Enter to save&next
+        ESC to cancel"
+                                id="blah"></i></th>{% endblocktrans %}
+                                <th class="text-center">{% trans "Post Time" %}</th>
+                                <th class="text-center">{% trans "Status" %}</th>
+                                {% if perms.auth.srp_management %}
+                                    <th class="text-center">{% trans "Actions" %}</th>
+                                {% endif %}
+                            </tr>
+                            {% for srpfleetrequest in srpfleetrequests %}
+                                <tr>
+                                    <td class="text-center">{{ srpfleetrequest.character.character_name }}</td>
+                                    <td class="text-center">
+                                        <a href="{{ srpfleetrequest.killboard_link }}"
+                                        target="_blank" class="label label-warning">Link</a>
+                                    </td>
+                                    <td class="text-center">{{ srpfleetrequest.additional_info }}</td>
+                                    <td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
+                                    <td class="text-center">{{ srpfleetrequest.kb_total_loss | intcomma }} ISK</td>
+                                    <td class="srp" data-name="srp_total_amount" data-type="number" data-pk="{{srpfleetrequest.id}}" data-url="{% url 'srp:request_update_amount' srpfleetrequest.id %}" data-params="{csrfmiddlewaretoken:'{{csrf_token}}'}" class="text-center">{{ srpfleetrequest.srp_total_amount | intcomma }} ISK</td>
+                                    <td class="text-center">{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}</td>
+                                    <td class="text-center">
+                                        {% if srpfleetrequest.srp_status == "Approved" %}
+                                            <div class="label label-success">
+                                                {% trans "Approved" %}
+                                            </div>
+                                        {% elif srpfleetrequest.srp_status == "Rejected" %}
+                                            <div class="label label-danger">
+                                                {% trans "Rejected" %}
+                                            </div>
+                                        {% else %}
+                                            <div class="label label-warning">
+                                                {% trans "Pending" %}
+                                            </div>
+                                        {% endif %}
+                                    </td>
+                                    {% if perms.auth.srp_management %}
+                                        <td class="text-center">
+                                            <div class="checkbox">
+                                                <label style="font-size: 1.5em">
+                                                    <input type="checkbox" name="{{srpfleetrequest.id}}">
+                                                    <span class="cr"><i class="cr-icon fa fa-check"></i></span>
+                                                </label>
+                                            </div>                            
+                                        </td>
+                                    {% endif %}
+                                </tr>
+                            {% endfor %}   
+                        </table>
+                    </div>
+                    <div class="alert alert-info" role="alert">
+                        <div class="text-right">
+                            <b><span style="padding-right:2.5em">{% trans "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
+                            <b><span style="padding-right:2.5em">{% trans "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                            {% if perms.auth.srp_management %}
+                                <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
+                                    <span class="glyphicon glyphicon-ok"></span>
+                                </button>
+                                <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
+                                    <span class="glyphicon glyphicon-remove"></span>
+                                </button>
+                                <button type="submit" title="Remove" onclick="return confirm('{% trans "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
+                                    <span class="glyphicon glyphicon-trash"></span>
+                                </button>
+                            {% endif %}
+                        </div>
+                    </div>
+                </form>
             {% else %}
-            <div class="alert alert-warning text-center">{% trans "No SRP requests for this fleet." %}</div>
+                <div class="alert alert-warning text-center">
+                    {% trans "No SRP requests for this fleet." %}
+                </div>
             {% endif %}
         </div>
     </div>

allianceauth/srp/templates/srp/management.html

@@ -31,94 +31,98 @@
                 </div>
             </div>
             {% if srpfleets %}
-            <table class="table">
+                <div class="table-responsive">
-                <tr>
+                    <table class="table">
-                    <th class="text-center">{% trans "Fleet Name" %}</th>
+                        <tr>
-                    <th class="text-center">{% trans "Fleet Time" %}</th>
+                            <th class="text-center">{% trans "Fleet Name" %}</th>
-                    <th class="text-center">{% trans "Fleet Doctrine" %}</th>
+                            <th class="text-center">{% trans "Fleet Time" %}</th>
-                    <th class="text-center">{% trans "Fleet Commander" %}</th>
+                            <th class="text-center">{% trans "Fleet Doctrine" %}</th>
-                    <th class="text-center">{% trans "Fleet AAR" %}</th>
+                            <th class="text-center">{% trans "Fleet Commander" %}</th>
-                    <th class="text-center">{% trans "Fleet SRP Code" %}</th>
+                            <th class="text-center">{% trans "Fleet AAR" %}</th>
-                    <th class="text-center">{% trans "Fleet ISK Cost" %}</th>
+                            <th class="text-center">{% trans "Fleet SRP Code" %}</th>
-                    <th class="text-center">{% trans "SRP Status" %}</th>
+                            <th class="text-center">{% trans "Fleet ISK Cost" %}</th>
-                    <th class="text-center">{% trans "Pending Requests" %}</th>
+                            <th class="text-center">{% trans "SRP Status" %}</th>
-                    <th width="100px" class="text-center">{% trans "Actions" %}</th>
+                            <th class="text-center">{% trans "Pending Requests" %}</th>
-                </tr>
+                            <th width="100px" class="text-center">{% trans "Actions" %}</th>
-                {% for srpfleet in srpfleets %}
+                        </tr>
-                    <tr>
+                        {% for srpfleet in srpfleets %}
-                        <td class="text-center">
+                            <tr>
-                            <div class="label label-info">
+                                <td class="text-center">
-                                {{ srpfleet.fleet_name }}
+                                    <div class="label label-info">
-                            </div>
+                                        {{ srpfleet.fleet_name }}
-                        </td>
+                                    </div>
-                        <td class="text-center">{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
+                                </td>
-                        <td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
+                                <td class="text-center">{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
-                        <td class="text-center">
+                                <td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
-                            <div class="label label-success">
+                                <td class="text-center">
-                                {{ srpfleet.fleet_commander.character_name }}
+                                    <div class="label label-success">
-                            </div>
+                                        {{ srpfleet.fleet_commander.character_name }}
-                        </td>
+                                    </div>
-                        <td class="text-center">
+                                </td>
-                            {%  if srpfleet.fleet_srp_aar_link %}
+                                <td class="text-center">
-                                <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% trans 'Link' %}</a>
+                                    {%  if srpfleet.fleet_srp_aar_link %}
-                            {%  endif %}
+                                        <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% trans 'Link' %}</a>
-                        </td>
+                                    {%  endif %}
-                        <td class="text-center">
+                                </td>
-                            {% if srpfleet.fleet_srp_code %}
+                                <td class="text-center">
-                                <a class="label label-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
+                                    {% if srpfleet.fleet_srp_code %}
-                            {% else %}
+                                        <a class="label label-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
-                                <div class="label label-danger">
+                                    {% else %}
-                                    {% trans "Disabled" %}
+                                        <div class="label label-danger">
-                                </div>
+                                            {% trans "Disabled" %}
-                            {% endif %}
+                                        </div>
-                        </td>
+                                    {% endif %}
-                        <td class="text-center">ISK: {{ srpfleet.total_cost | intcomma }}</td>
+                                </td>
+                                <td class="text-center">ISK: {{ srpfleet.total_cost | intcomma }}</td>
 
-                        <td class="text-center">
+                                <td class="text-center">
-                            {% if srpfleet.fleet_srp_status == "" %}
+                                    {% if srpfleet.fleet_srp_status == "" %}
-                                <div class="label label-warning">
+                                        <div class="label label-warning">
-                                    {% trans "Pending" %}
+                                            {% trans "Pending" %}
-                                </div>
+                                        </div>
-                            {% else %}
+                                    {% else %}
-                                <div class="label label-success">
+                                        <div class="label label-success">
-                                    {% trans "Completed" %}
+                                            {% trans "Completed" %}
-                                </div>
+                                        </div>
-                            {% endif %}
+                                    {% endif %}
-                        </td>
+                                </td>
-                        <td class="text-center">
+                                <td class="text-center">
-                            <div class="label label-warning">{{ srpfleet.pending_requests }}</div>
+                                    <div class="label label-warning">{{ srpfleet.pending_requests }}</div>
-                        </td>
+                                </td>
-                        <td class="text-center">
+                                <td class="text-center">
 
-                            <a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary" title="View">
+                                    <a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary" title="View">
-                                <span class="glyphicon glyphicon-eye-open"></span>
+                                        <span class="glyphicon glyphicon-eye-open"></span>
-                            </a>
-
-                            {% if perms.auth.srp_management %}
-                                <a href="{% url 'srp:edit' srpfleet.id %}" class="btn btn-info" title="Edit">
-                                    <span class="glyphicon glyphicon-pencil"></span>
-                                </a>
-
-                                <a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% trans "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
-                                    <span class="glyphicon glyphicon-trash"></span>
-                                </a>
-                                {% if srpfleet.fleet_srp_code %}
-                                    <a href="{% url 'srp:disable' srpfleet.id %}" class="btn btn-warning" title="Disable">
-                                        <span class="glyphicon glyphicon-remove-sign"></span>
                                     </a>
-                                {% else %}
-                                    <a href="{% url 'srp:enable' srpfleet.id %}" class="btn btn-success" title="Enable">
-                                        <span class="glyphicon glyphicon-ok-sign"></span>
-                                    </a>
-                                {% endif %}
 
-                            {% endif %}
+                                    {% if perms.auth.srp_management %}
-                        </td>
+                                        <a href="{% url 'srp:edit' srpfleet.id %}" class="btn btn-info" title="Edit">
-                    </tr>
+                                            <span class="glyphicon glyphicon-pencil"></span>
-                {% endfor %}
+                                        </a>
-            </table>
+
+                                        <a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% trans "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
+                                            <span class="glyphicon glyphicon-trash"></span>
+                                        </a>
+                                        {% if srpfleet.fleet_srp_code %}
+                                            <a href="{% url 'srp:disable' srpfleet.id %}" class="btn btn-warning" title="Disable">
+                                                <span class="glyphicon glyphicon-remove-sign"></span>
+                                            </a>
+                                        {% else %}
+                                            <a href="{% url 'srp:enable' srpfleet.id %}" class="btn btn-success" title="Enable">
+                                                <span class="glyphicon glyphicon-ok-sign"></span>
+                                            </a>
+                                        {% endif %}
+
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
             {% else %}
-            <div class="alert alert-warning text-center">{% trans "No SRP fleets created." %}</div>
+                <div class="alert alert-warning text-center">
+                    {% trans "No SRP fleets created." %}
+                </div>
             {% endif %}
         </div>
     </div>

allianceauth/static/css/auth-base.css

@@ -42,3 +42,51 @@ ul.list-group.list-group-horizontal > li.list-group-item {
 .flex-center-horizontal {
     justify-content: center;
 }
+
+/* style group headers within a table */
+.tr-group {
+    font-weight: bold;
+    background-color: #e6e6e6 !important;
+}
+
+/* default style for tables */
+.table-aa > thead > tr > th{
+    border-bottom: 1px solid #f2f2f2;
+}
+.table-aa > thead > tr > th{    
+    vertical-align: middle;
+}
+.table-aa > tbody > tr > td{
+    border-bottom: 1px solid #f2f2f2;
+}
+.table-aa > tbody > tr > td {    
+    vertical-align: middle;
+}
+.table-aa > tbody > tr:last-child {    
+    border-bottom: none;
+}
+
+/* Small devices (tablets, 768px and up) */
+@media (min-width: 768px) {
+    
+    /* class for vertically aligning columns in a bootstrap row */
+    .row.vertical-flexbox-row2 {
+        display:  -webkit-box;
+        display: -webkit-flex;
+        display:  -ms-flexbox;
+        display:         flex;
+        flex-wrap: wrap;
+      }
+      
+      .row.vertical-flexbox-row2 > [class*='col-'] {
+        display: flex;
+        flex-direction: column;
+      }
+}
+
+/* Extra Small devices (Phones, <768px) */
+@media (max-width: 767px) {
+    .button-wrapper .btn {
+        margin-bottom:5px;
+    }
+}

allianceauth/static/js/filterDropDown/filterDropDown.min.js

@@ -0,0 +1 @@
+!function(t){function e(t){var e={columns:[],columnsIdxList:[],bootstrap:!1,autoSize:!0,label:"Filter "};if("bootstrap"in t&&"boolean"==typeof t.bootstrap&&(e.bootstrap=t.bootstrap),"autoSize"in t&&"boolean"==typeof t.autoSize&&(e.autoSize=t.autoSize),"label"in t&&"string"==typeof t.label&&(e.label=t.label),"columns"in t)for(var i=0;i<t.columns.length;i++){var n=t.columns[i];if("idx"in n&&"number"==typeof n.idx){var o=n.idx;e.columns[o]={title:null,maxWidth:null,autoSize:!0},e.columnsIdxList.push(o),"title"in n&&"string"==typeof n.title&&(e.columns[o].title=n.title),"maxWidth"in n&&"string"==typeof n.maxWidth&&(e.columns[o].maxWidth=n.maxWidth),"autoSize"in n&&"boolean"==typeof n.autoSize&&(e.columns[o].autoSize=n.autoSize)}}return e}t(document).on("preInit.dt",function(i,n){if("dt"===i.namespace){var o=new t.fn.dataTable.Api(n),a=o.table().node().id,l=o.init();if("filterDropDown"in l){var r=e(l.filterDropDown);if(0!=r.columns.length){var u=o.table().container(),s=a+"_filterWrapper",c=s+" "+(r.bootstrap?"form-inline":"");t(u).prepend('<div id="'+s+'" class="'+c+'">'+r.label+"</div>"),o.columns(r.columnsIdxList).every(function(){var e=this.index(),i=null!==r.columns[e].title?r.columns[e].title:t(this.header()).html();""==i&&(i="column "+(e+1));var n="form-control "+a+"_filterSelect",o=a+"_filterSelect"+e;t("#"+s).append('<select id="'+o+'" class="'+n+'"></select>');var l=t("#"+o).empty().append('<option value="">('+i+")</option>");r.autoSize&&r.columns[e].autoSize&&screen.width>768&&l.css("max-width",l.outerWidth()),null!==r.columns[e].maxWidth&&l.css("max-width",r.columns[e].maxWidth)})}}}}),t(document).on("init.dt",function(i,n){if("dt"===i.namespace){var o=new t.fn.dataTable.Api(n),a=o.table().node().id,l=o.init();if("filterDropDown"in l){var r=e(l.filterDropDown);o.table().container();o.columns(r.columnsIdxList).every(function(){var e=this,i=e.index(),n=t("#"+(a+"_filterSelect"+i));n.on("change",function(){var i=t.fn.dataTable.util.escapeRegex(t(this).val());e.search(i?"^"+i+"$":"",!0,!1).draw()}),e.data().unique().sort().each(function(t,e){""!=t&&n.append('<option value="'+t+'">'+t+"</option>")})})}}})}(jQuery);

allianceauth/static/js/filterDropDown/filterDropDown.min.js:Zone.Identifier

@@ -0,0 +1,4 @@
+[ZoneTransfer]
+ZoneId=3
+ReferrerUrl=https://github.com/ErikKalkoken/filterDropDown/blob/master/js/filterDropDown.min.js
+HostUrl=https://raw.githubusercontent.com/ErikKalkoken/filterDropDown/master/js/filterDropDown.min.js

allianceauth/templates/allianceauth/admin-status/overview.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="col-sm-12">
-    <div class="row vertical-flexbox-row">
+    <div class="row vertical-flexbox-row2">
         <div class="col-sm-6">
             <div class="panel panel-primary" style="height:100%;position:relative;">
                 <div class="panel-heading text-center"><h3 class="panel-title">{% trans "Alliance Auth Notifications" %}</h3></div>
@@ -31,33 +31,36 @@
                 <div class="panel-body flex-center-horizontal">
                     <ul class="list-group list-group-horizontal" style="margin-bottom: 0;">
                         <li class="list-group-item">
-                            <h4 class="list-group-item-heading">{% trans "Current" %}</h4>
+                            <h5 class="list-group-item-heading">{% trans "Current" %}</h5>
                             <p class="list-group-item-text">
                                 {{ current_version }}
                             </p>
                         </li>
                         <li class="list-group-item list-group-item-{% if latest_major %}success{% else %}warning{% endif %}">
-                            <h4 class="list-group-item-heading">{% trans "Latest Major" %}</h4>
+                            <h5 class="list-group-item-heading">{% trans "Latest Major" %}</h5>
                             <p class="list-group-item-text">
-                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i>
+                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
+                                    <i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_major_version }}
                                 </a>
                                 {% if not latest_major %}<br>{% trans "Update available" %}{% endif %}
                             </p>
                         </li>
                         <li class="list-group-item list-group-item-{% if latest_minor %}success{% else %}warning{% endif %}">
-                            <h4 class="list-group-item-heading">{% trans "Latest Minor" %}</h4>
+                            <h5 class="list-group-item-heading">{% trans "Latest Minor" %}</h5>
                             <p class="list-group-item-text">
-                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i>
+                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
+                                    <i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_minor_version }}
                                 </a>
                                 {% if not latest_minor %}<br>{% trans "Update available" %}{% endif %}
                             </p>
                         </li>
                         <li class="list-group-item list-group-item-{% if latest_patch %}success{% else %}danger{% endif %}">
-                            <h4 class="list-group-item-heading">{% trans "Latest Patch" %}</h4>
+                            <h5 class="list-group-item-heading">{% trans "Latest Patch" %}</h5>
                             <p class="list-group-item-text">
-                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i>
+                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
+                                    <i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_patch_version }}
                                 </a>
                                 {% if not latest_patch %}<br>{% trans "Update available" %}{% endif %}

allianceauth/timerboard/templates/timerboard/view.html

@@ -12,7 +12,9 @@
         <h1 class="page-header text-center">{% trans "Structure Timers" %}
             <div class="text-right">
                 {% if perms.auth.timer_management %}
-                    <a href="{% url 'timerboard:add' %}" class="btn btn-success">{% trans "Create Structure Timer" %}</a>
+                    <a href="{% url 'timerboard:add' %}" class="btn btn-success">
+                        {% trans "Create Structure Timer" %}
+                    </a>
                 {% endif %}
             </div>
         </h1>
@@ -24,484 +26,500 @@
         </div>
         {% if corp_timers %}
             <h4><b>{% trans "Corp Timers" %}</b></h4>
-            <table class="table">
+            <div class="table-responsive">
-                <tr>
+                <table class="table">
-                    <th style="width:150px" class="text-center">{% trans "Details" %}</th>
+                    <tr>
-                    <th class="text-center">{% trans "Objective" %}</th>
+                        <th style="width:150px" class="text-center">{% trans "Details" %}</th>
-                    <th class="text-center">{% trans "System" %}</th>
+                        <th class="text-center">{% trans "Objective" %}</th>
-                    <th class="text-center">{% trans "Structure" %}</th>
+                        <th class="text-center">{% trans "System" %}</th>
-                    <th class="text-center">{% trans "Eve Time" %}</th>
+                        <th class="text-center">{% trans "Structure" %}</th>
-                    <th class="text-center">{% trans "Local Time" %}</th>
+                        <th class="text-center">{% trans "Eve Time" %}</th>
-                    <th class="text-center">{% trans "Creator" %}</th>
+                        <th class="text-center">{% trans "Local Time" %}</th>
-                    {% if perms.auth.timer_management %}
+                        <th class="text-center">{% trans "Creator" %}</th>
-                        <th class="text-center">{% trans "Action" %}</th>
+                        {% if perms.auth.timer_management %}
-                    {% endif %}
+                            <th class="text-center">{% trans "Action" %}</th>
-                </tr>
+                        {% endif %}
-                {% for timer in corp_timers %}
+                    </tr>
-                    {% if timer.important == True %}
+                    {% for timer in corp_timers %}
-                        <tr class="danger">
+                        {% if timer.important == True %}
-                            {% else %}
+                            <tr class="danger">
-                        <tr class="info">
+                                {% else %}
-                    {% endif %}
+                            <tr class="info">
-                <td style="width:150px" class="text-center">{{ timer.details }}</td>
+                        {% endif %}
-                <td class="text-center">
+                    <td style="width:150px" class="text-center">{{ timer.details }}</td>
-                    {% if timer.objective == "Hostile" %}
-                        <div class="label label-danger">
-                            {% trans "Hostile" %}
-                        </div>
-                    {% endif %}
-                    {% if timer.objective == "Friendly" %}
-                        <div class="label label-primary">
-                            {% trans "Friendly" %}
-                        </div>
-                    {% endif %}
-                    {% if timer.objective == "Neutral" %}
-                        <div class="label label-default">
-                            {% trans "Neutral" %}
-                        </div>
-                    {% endif %}
-                </td>
-                <td class="text-center"><a
-                        href="{{ timer.system|dotlan_solar_system_url }}">{{ timer.system }} {{ timer.planet_moon }} </a>
-                </td>
-                <td class="text-center">
-                    {% if timer.structure == "POCO" %}
-                        <div class="label label-info">
-                            POCO
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "I-HUB" %}
-                        <div class="label label-warning">
-                            I-HUB
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "TCU" %}
-                        <div class="label label-danger">
-                            TCU
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "POS[S]" %}
-                        <div class="label label-info">
-                            POS [S]
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "POS[M]" %}
-                        <div class="label label-info">
-                            POS [M]
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "POS[L]" %}
-                        <div class="label label-info">
-                            POS [L]
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
-                        <div class="label label-danger">
-                            Astrahus
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
-                        <div class="label label-danger">
-                            Fortizar
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
-                        <div class="label label-danger">
-                            Keepstar
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
-                        <div class="label label-warning">
-                            Raitaru
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
-                        <div class="label label-warning">
-                            Azbel
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
-                        <div class="label label-warning">
-                            Sotiyo
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
-                        <div class="label label-warning">
-                            Athanor
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara"%}
-                        <div class="label label-warning">
-                            Tatara
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
-                        <div class="label label-warning">
-                            Cyno Beacon
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
-                        <div class="label label-warning">
-                            Tenebrex Cyno Jammer
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
-                        <div class="label label-warning">
-                            Ansiblex Jump Gate
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Moon Mining Cycle" %}
-                        <div class="label label-success">
-                            Moon Mining Cycle
-                        </div>
-                    {% endif %}
-                    {% if timer.structure == "Other" %}
-                        <div class="label label-default">
-                            Other
-                        </div>
-                    {% endif %}
-                </td>
-                <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
-                <td class="text-center" nowrap>
-                    <div id="localtime{{ timer.id }}"></div>
-                    <div id="countdown{{ timer.id }}"></div>
-                </td>
-                <td class="text-center">{{ timer.eve_character.character_name }}</td>
-                {% if perms.auth.timer_management %}
                     <td class="text-center">
-                        <a href="{% url 'timerboard:delete' timer.id %}" class="btn btn-danger">
+                        {% if timer.objective == "Hostile" %}
-                            <span class="glyphicon glyphicon-remove"></span>
+                            <div class="label label-danger">
-                        </a>
+                                {% trans "Hostile" %}
-                        <a href="{% url 'timerboard:edit' timer.id %}" class="btn btn-info">
+                            </div>
-                            <span class="glyphicon glyphicon-pencil"></span>
+                        {% endif %}
+                        {% if timer.objective == "Friendly" %}
+                            <div class="label label-primary">
+                                {% trans "Friendly" %}
+                            </div>
+                        {% endif %}
+                        {% if timer.objective == "Neutral" %}
+                            <div class="label label-default">
+                                {% trans "Neutral" %}
+                            </div>
+                        {% endif %}
+                    </td>
+                    <td class="text-center"><a href="{{ timer.system|dotlan_solar_system_url }}">
+                        {{ timer.system }} {{ timer.planet_moon }}
                         </a>
                     </td>
-                {% endif %}
+                    <td class="text-center">
-                </tr>
+                        {% if timer.structure == "POCO" %}
-            {% endfor %}
+                            <div class="label label-info">
-            </table>
+                                POCO
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "I-HUB" %}
+                            <div class="label label-warning">
+                                I-HUB
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "TCU" %}
+                            <div class="label label-danger">
+                                TCU
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "POS[S]" %}
+                            <div class="label label-info">
+                                POS [S]
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "POS[M]" %}
+                            <div class="label label-info">
+                                POS [M]
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "POS[L]" %}
+                            <div class="label label-info">
+                                POS [L]
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
+                            <div class="label label-danger">
+                                Astrahus
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
+                            <div class="label label-danger">
+                                Fortizar
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
+                            <div class="label label-danger">
+                                Keepstar
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
+                            <div class="label label-warning">
+                                Raitaru
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
+                            <div class="label label-warning">
+                                Azbel
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
+                            <div class="label label-warning">
+                                Sotiyo
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
+                            <div class="label label-warning">
+                                Athanor
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara"%}
+                            <div class="label label-warning">
+                                Tatara
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
+                            <div class="label label-warning">
+                                Cyno Beacon
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
+                            <div class="label label-warning">
+                                Tenebrex Cyno Jammer
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
+                            <div class="label label-warning">
+                                Ansiblex Jump Gate
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Moon Mining Cycle" %}
+                            <div class="label label-success">
+                                Moon Mining Cycle
+                            </div>
+                        {% endif %}
+                        {% if timer.structure == "Other" %}
+                            <div class="label label-default">
+                                Other
+                            </div>
+                        {% endif %}
+                    </td>
+                    <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
+                    <td class="text-center" nowrap>
+                        <div id="localtime{{ timer.id }}"></div>
+                        <div id="countdown{{ timer.id }}"></div>
+                    </td>
+                    <td class="text-center">{{ timer.eve_character.character_name }}</td>
+                    {% if perms.auth.timer_management %}
+                        <td class="text-center">
+                            <a href="{% url 'timerboard:delete' timer.id %}" class="btn btn-danger">
+                                <span class="glyphicon glyphicon-remove"></span>
+                            </a>
+                            <a href="{% url 'timerboard:edit' timer.id %}" class="btn btn-info">
+                                <span class="glyphicon glyphicon-pencil"></span>
+                            </a>
+                        </td>
+                    {% endif %}
+                    </tr>
+                {% endfor %}
+                </table>
+            </div>
         {% endif %}
         <h4><b>{% trans "Next Timers" %}</b></h4>
         {% if future_timers %}
-        <table class="table">
+            <div class="table-responsive">
-            <tr>
+                <table class="table">
-                <th style="width:150px" class="text-center">{% trans "Details" %}</th>
+                    <tr>
-                <th class="text-center">{% trans "Objective" %}</th>
+                        <th style="width:150px" class="text-center">{% trans "Details" %}</th>
-                <th class="text-center">{% trans "System" %}</th>
+                        <th class="text-center">{% trans "Objective" %}</th>
-                <th class="text-center">{% trans "Structure" %}</th>
+                        <th class="text-center">{% trans "System" %}</th>
-                <th class="text-center">{% trans "Eve Time" %}</th>
+                        <th class="text-center">{% trans "Structure" %}</th>
-                <th class="text-center">{% trans "Local Time" %}</th>
+                        <th class="text-center">{% trans "Eve Time" %}</th>
-                <th class="text-center">{% trans "Creator" %}</th>
+                        <th class="text-center">{% trans "Local Time" %}</th>
-                {% if perms.auth.timer_management %}
+                        <th class="text-center">{% trans "Creator" %}</th>
-                    <th class="text-center">{% trans "Action" %}</th>
+                        {% if perms.auth.timer_management %}
-                {% endif %}
+                            <th class="text-center">{% trans "Action" %}</th>
-            </tr>
+                        {% endif %}
-            {% for timer in future_timers %}
+                    </tr>
-                {% if timer.important == True %}
+                    {% for timer in future_timers %}
-                    <tr class="danger">
+                        {% if timer.important == True %}
-                {% else %}
+                            <tr class="danger">
-                    <tr class="info">
+                        {% else %}
-                {% endif %}
+                            <tr class="info">
-                <td style="width:150px" class="text-center">{{ timer.details }}</td>
+                        {% endif %}
-                <td class="text-center">
+                        <td style="width:150px" class="text-center">{{ timer.details }}</td>
-                {% if timer.objective == "Hostile" %}
+                        <td class="text-center">
-                    <div class="label label-danger">
+                        {% if timer.objective == "Hostile" %}
-                        {% trans "Hostile" %}
+                            <div class="label label-danger">
-                    </div>
+                                {% trans "Hostile" %}
-                {% endif %}
+                            </div>
-                {% if timer.objective == "Friendly" %}
+                        {% endif %}
-                    <div class="label label-primary">
+                        {% if timer.objective == "Friendly" %}
-                        {% trans "Friendly" %}
+                            <div class="label label-primary">
-                    </div>
+                                {% trans "Friendly" %}
-                {% endif %}
+                            </div>
-                {% if timer.objective == "Neutral" %}
+                        {% endif %}
-                    <div class="label label-default">
+                        {% if timer.objective == "Neutral" %}
-                        {% trans "Neutral" %}
+                            <div class="label label-default">
-                    </div>
+                                {% trans "Neutral" %}
-                {% endif %}
+                            </div>
-                </td>
+                        {% endif %}
-                <td class="text-center">
+                        </td>
-                    <a href="{{ timer.system|dotlan_solar_system_url }}">{{ timer.system }} {{ timer.planet_moon }}</a>
+                        <td class="text-center">
-                </td>
+                            <a href="{{ timer.system|dotlan_solar_system_url }}">
-                <td class="text-center">
+                                {{ timer.system }} {{ timer.planet_moon }}
-                    {% if timer.structure == "POCO" %}
+                            </a>
-                        <div class="label label-info">
+                        </td>
-                            POCO
+                        <td class="text-center">
-                        </div>
+                            {% if timer.structure == "POCO" %}
-                    {% endif %}
+                                <div class="label label-info">
-                    {% if timer.structure == "I-HUB" %}
+                                    POCO
-                        <div class="label label-warning">
+                                </div>
-                            I-HUB
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "I-HUB" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "TCU" %}
+                                    I-HUB
-                        <div class="label label-danger">
+                                </div>
-                            TCU
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "TCU" %}
-                    {% endif %}
+                                <div class="label label-danger">
-                    {% if timer.structure == "POS[S]" %}
+                                    TCU
-                        <div class="label label-info">
+                                </div>
-                            POS [S]
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "POS[S]" %}
-                    {% endif %}
+                                <div class="label label-info">
-                    {% if timer.structure == "POS[M]" %}
+                                    POS [S]
-                        <div class="label label-info">
+                                </div>
-                            POS [M]
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "POS[M]" %}
-                    {% endif %}
+                                <div class="label label-info">
-                    {% if timer.structure == "POS[L]" %}
+                                    POS [M]
-                        <div class="label label-info">
+                                </div>
-                            POS [L]
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "POS[L]" %}
-                    {% endif %}
+                                <div class="label label-info">
-                    {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
+                                    POS [L]
-                        <div class="label label-danger">
+                                </div>
-                            Astrahus
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
-                    {% endif %}
+                                <div class="label label-danger">
-                    {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
+                                    Astrahus
-                        <div class="label label-danger">
+                                </div>
-                            Fortizar
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
-                    {% endif %}
+                                <div class="label label-danger">
-                    {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
+                                    Fortizar
-                        <div class="label label-danger">
+                                </div>
-                            Keepstar
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
-                    {% endif %}
+                                <div class="label label-danger">
-                    {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
+                                    Keepstar
-                        <div class="label label-warning">
+                                </div>
-                            Raitaru
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
+                                    Raitaru
-                        <div class="label label-warning">
+                                </div>
-                            Azbel
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
+                                    Azbel
-                        <div class="label label-warning">
+                                </div>
-                            Sotiyo
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
+                                    Sotiyo
-                        <div class="label label-warning">
+                                </div>
-                            Athanor
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
+                                    Athanor
-                        <div class="label label-warning">
+                                </div>
-                            Tatara
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
+                                    Tatara
-                        <div class="label label-warning">
+                                </div>
-                            Pharolux Cyno Beacon
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
+                                    Pharolux Cyno Beacon
-                        <div class="label label-warning">
+                                </div>
-                            Tenebrex Cyno Jammer
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
+                                    Tenebrex Cyno Jammer
-                        <div class="label label-warning">
+                                </div>
-                            Ansiblex Jump Gate
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Moon Mining Cycle" %}
+                                    Ansiblex Jump Gate
-                        <div class="label label-success">
+                                </div>
-                            Moon Mining Cycle
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Moon Mining Cycle" %}
-                    {% endif %}
+                                <div class="label label-success">
-                    {% if timer.structure == "Other" %}
+                                    Moon Mining Cycle
-                        <div class="label label-default">
+                                </div>
-                            Other
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Other" %}
-                    {% endif %}
+                                <div class="label label-default">
-                </td>
+                                    Other
-                <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
+                                </div>
-                <td class="text-center" nowrap>
+                            {% endif %}
-                    <div id="localtime{{ timer.id }}"></div>
+                        </td>
-                    <div id="countdown{{ timer.id }}"></div>
+                        <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
-                </td>
+                        <td class="text-center" nowrap>
-                <td class="text-center">{{ timer.eve_character.character_name }}</td>
+                            <div id="localtime{{ timer.id }}"></div>
-                {% if perms.auth.timer_management %}
+                            <div id="countdown{{ timer.id }}"></div>
-                    <td class="text-center">
+                        </td>
-                        <a href="{% url 'timerboard:delete' timer.id %}" class="btn btn-danger">
+                        <td class="text-center">{{ timer.eve_character.character_name }}</td>
-                            <span class="glyphicon glyphicon-remove"></span>
+                        {% if perms.auth.timer_management %}
-                        </a>
+                            <td class="text-center">
-                        <a href="{% url 'timerboard:edit' timer.id %}" class="btn btn-info">
+                                <a href="{% url 'timerboard:delete' timer.id %}" class="btn btn-danger">
-                            <span class="glyphicon glyphicon-pencil"></span>
+                                    <span class="glyphicon glyphicon-remove"></span>
-                        </a>
+                                </a>
-                    </td>
+                                <a href="{% url 'timerboard:edit' timer.id %}" class="btn btn-info">
-                {% endif %}
+                                    <span class="glyphicon glyphicon-pencil"></span>
-                </tr>
+                                </a>
-            {% endfor %}
+                            </td>
-        </table>
+                        {% endif %}
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
         {% else %}
-        <div class="alert alert-warning text-center">{% trans "No upcoming timers." %}</div>
+            <div class="alert alert-warning text-center">
+                {% trans "No upcoming timers." %}
+            </div>
         {% endif %}
+
         <h4><b>{% trans "Past Timers" %}</b></h4>
         {% if past_timers %}
-        <table class="table">
+            <div class="table-responsive">
-            <tr>
+                <table class="table">
-                <th style="width:150px" class="text-center">{% trans "Details" %}</th>
+                    <tr>
-                <th class="text-center">{% trans "Objective" %}</th>
+                        <th style="width:150px" class="text-center">{% trans "Details" %}</th>
-                <th class="text-center">{% trans "System" %}</th>
+                        <th class="text-center">{% trans "Objective" %}</th>
-                <th class="text-center">{% trans "Structure" %}</th>
+                        <th class="text-center">{% trans "System" %}</th>
-                <th class="text-center">{% trans "Eve Time" %}</th>
+                        <th class="text-center">{% trans "Structure" %}</th>
-                <th class="text-center">{% trans "Local Time" %}</th>
+                        <th class="text-center">{% trans "Eve Time" %}</th>
-                <th class="text-center">{% trans "Creator" %}</th>
+                        <th class="text-center">{% trans "Local Time" %}</th>
-                {% if perms.auth.timer_management %}
+                        <th class="text-center">{% trans "Creator" %}</th>
-                    <th class="text-center">{% trans "Action" %}</th>
+                        {% if perms.auth.timer_management %}
-                {% endif %}
+                            <th class="text-center">{% trans "Action" %}</th>
-            </tr>
+                        {% endif %}
-            {% for timer in past_timers %}
+                    </tr>
-                {% if timer.important == True %}
+                    {% for timer in past_timers %}
-                    <tr class="danger">
+                        {% if timer.important == True %}
-                        {% else %}
+                            <tr class="danger">
-                    <tr class="info">
+                                {% else %}
-                {% endif %}
+                            <tr class="info">
-                <td style="width:150px" class="text-center">{{ timer.details }}</td>
+                        {% endif %}
-                <td class="text-center">
+                        <td style="width:150px" class="text-center">{{ timer.details }}</td>
-                {% if timer.objective == "Hostile" %}
+                        <td class="text-center">
-                    <div class="label label-danger">
+                        {% if timer.objective == "Hostile" %}
-                        {% trans "Hostile" %}
+                            <div class="label label-danger">
-                    </div>
+                                {% trans "Hostile" %}
-                {% endif %}
+                            </div>
-                {% if timer.objective == "Friendly" %}
+                        {% endif %}
-                    <div class="label label-primary">
+                        {% if timer.objective == "Friendly" %}
-                        {% trans "Friendly" %}
+                            <div class="label label-primary">
-                    </div>
+                                {% trans "Friendly" %}
-                {% endif %}
+                            </div>
-                {% if timer.objective == "Neutral" %}
+                        {% endif %}
-                    <div class="label label-default">
+                        {% if timer.objective == "Neutral" %}
-                        {% trans "Neutral" %}
+                            <div class="label label-default">
-                    </div>
+                                {% trans "Neutral" %}
-                {% endif %}
+                            </div>
-                </td>
+                        {% endif %}
-                <td class="text-center">
+                        </td>
-                    <a href="{{ timer.system|dotlan_solar_system_url }}">{{ timer.system }} {{ timer.planet_moon }}</a>
+                        <td class="text-center">
-                </td>
+                            <a href="{{ timer.system|dotlan_solar_system_url }}">
-                <td class="text-center">
+                                {{ timer.system }} {{ timer.planet_moon }}
-                    {% if timer.structure == "POCO" %}
+                            </a>
-                        <div class="label label-info">
+                        </td>
-                            POCO
+                        <td class="text-center">
-                        </div>
+                            {% if timer.structure == "POCO" %}
-                    {% endif %}
+                                <div class="label label-info">
-                    {% if timer.structure == "I-HUB" %}
+                                    POCO
-                        <div class="label label-warning">
+                                </div>
-                            I-HUB
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "I-HUB" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "TCU" %}
+                                    I-HUB
-                        <div class="label label-danger">
+                                </div>
-                            TCU
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "TCU" %}
-                    {% endif %}
+                                <div class="label label-danger">
-                    {% if timer.structure == "POS[S]" %}
+                                    TCU
-                        <div class="label label-info">
+                                </div>
-                            POS [S]
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "POS[S]" %}
-                    {% endif %}
+                                <div class="label label-info">
-                    {% if timer.structure == "POS[M]" %}
+                                    POS [S]
-                        <div class="label label-info">
+                                </div>
-                            POS [M]
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "POS[M]" %}
-                    {% endif %}
+                                <div class="label label-info">
-                    {% if timer.structure == "POS[L]" %}
+                                    POS [M]
-                        <div class="label label-info">
+                                </div>
-                            POS [L]
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "POS[L]" %}
-                    {% endif %}
+                                <div class="label label-info">
-                    {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
+                                    POS [L]
-                        <div class="label label-danger">
+                                </div>
-                            Astrahus
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
-                    {% endif %}
+                                <div class="label label-danger">
-                    {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
+                                    Astrahus
-                        <div class="label label-danger">
+                                </div>
-                            Fortizar
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
-                    {% endif %}
+                                <div class="label label-danger">
-                    {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
+                                    Fortizar
-                        <div class="label label-danger">
+                                </div>
-                            Keepstar
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
-                    {% endif %}
+                                <div class="label label-danger">
-                    {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
+                                    Keepstar
-                        <div class="label label-warning">
+                                </div>
-                            Raitaru
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
+                                    Raitaru
-                        <div class="label label-warning">
+                                </div>
-                            Azbel
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
+                                    Azbel
-                        <div class="label label-warning">
+                                </div>
-                            Sotiyo
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
+                                    Sotiyo
-                        <div class="label label-warning">
+                                </div>
-                            Athanor
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
+                                    Athanor
-                        <div class="label label-warning">
+                                </div>
-                            Tatara
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
+                                    Tatara
-                        <div class="label label-warning">
+                                </div>
-                            Pharolux Cyno Beacon
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
+                                    Pharolux Cyno Beacon
-                        <div class="label label-warning">
+                                </div>
-                            Tenebrex Cyno Jammer
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
+                                    Tenebrex Cyno Jammer
-                        <div class="label label-warning">
+                                </div>
-                            Ansiblex Jump Gate
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
-                    {% endif %}
+                                <div class="label label-warning">
-                    {% if timer.structure == "Moon Mining Cycle" %}
+                                    Ansiblex Jump Gate
-                        <div class="label label-success">
+                                </div>
-                            Moon Mining Cycle
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Moon Mining Cycle" %}
-                    {% endif %}
+                                <div class="label label-success">
-                    {% if timer.structure == "Other" %}
+                                    Moon Mining Cycle
-                        <div class="label label-default">
+                                </div>
-                            Other
+                            {% endif %}
-                        </div>
+                            {% if timer.structure == "Other" %}
-                    {% endif %}
+                                <div class="label label-default">
-                </td>
+                                    Other
-                <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
+                                </div>
-                <td class="text-center" nowrap>
+                            {% endif %}
-                    <div id="localtime{{ timer.id }}"></div>
+                        </td>
-                    <div id="countdown{{ timer.id }}"></div>
+                        <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
-                </td>
+                        <td class="text-center" nowrap>
-                <td class="text-center">{{ timer.eve_character.character_name }}</td>
+                            <div id="localtime{{ timer.id }}"></div>
-                {% if perms.auth.timer_management %}
+                            <div id="countdown{{ timer.id }}"></div>
-                    <td class="text-center">
+                        </td>
-                        <a href="{% url 'timerboard:delete' timer.id %}" class="btn btn-danger">
+                        <td class="text-center">{{ timer.eve_character.character_name }}</td>
-                            <span class="glyphicon glyphicon-remove"></span>
+                        {% if perms.auth.timer_management %}
-                        </a>
+                            <td class="text-center">
-                        <a href="{% url 'timerboard:edit' timer.id %}" class="btn btn-info">
+                                <a href="{% url 'timerboard:delete' timer.id %}" class="btn btn-danger">
-                            <span class="glyphicon glyphicon-pencil"></span>
+                                    <span class="glyphicon glyphicon-remove"></span>
-                        </a>
+                                </a>
-                    </td>
+                                <a href="{% url 'timerboard:edit' timer.id %}" class="btn btn-info">
-                {% endif %}
+                                    <span class="glyphicon glyphicon-pencil"></span>
-                </tr>
+                                </a>
-            {% endfor %}
+                            </td>
-        </table>
+                        {% endif %}
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
         {% else %}
-        <div class="alert alert-warning text-center">{% trans "No past timers." %}</div>
+            <div class="alert alert-warning text-center">
+                {% trans "No past timers." %}
+            </div>
         {% endif %}
     </div>
 

docs/features/nameformats.md

@@ -25,8 +25,6 @@ Currently the following services support custom name formats:
 +-------------+-----------+-------------------------------------+
 | phpBB3      | Username  | ``{character_name}``                |
 +-------------+-----------+-------------------------------------+
-| SeAT        | Username  | ``{character_name}``                |
-+-------------+-----------+-------------------------------------+
 | SMF         | Username  | ``{character_name}``                |
 +-------------+-----------+-------------------------------------+
 | Teamspeak 3 | Nickname  | ``[{corp_ticker}]{character_name}`` |

docs/installation/services/index.md

@@ -4,7 +4,6 @@
 .. toctree::
 
     permissions
-    market
     discord
     discourse
     mumble

docs/installation/services/market.md

@@ -1,7 +0,0 @@
-# Alliance Market
-
-## Deprecation
-
-Alliance Market relies on the now non-functional XML API.
-
-Please remove this service data with `python manage.py migrate appname zero` and then remove from your  `INSTALLED_APPS` list.

docs/installation/services/smf.md

@@ -62,7 +62,7 @@ SMF needs a database. Create one:
 Enter the database information into the `DATABASES['smf']` section of your auth project's settings file.
 
 ### Web Server Configuration
-Your web server needs to be configured to serve Alliance Market.
+Your web server needs to be configured to serve SMF.
 
 A minimal Apache config might look like:
 

setup.py

@@ -21,7 +21,7 @@ install_requires = [
     'celery>=4.3.0,<5.0.0',
     'celery_once',
 
-    'django>=2.0,<3.0',
+    'django>=2.2.1,<3.0',
     'django-bootstrap-form',
     'django-registration==2.4',
     'django-sortedm2m',
@@ -75,6 +75,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],

tests/settings.py

@@ -29,9 +29,7 @@ INSTALLED_APPS += [
     'allianceauth.services.modules.discord',
     'allianceauth.services.modules.discourse',
     'allianceauth.services.modules.ips4',
-    'allianceauth.services.modules.market',
     'allianceauth.services.modules.openfire',
-    'allianceauth.services.modules.seat',
     'allianceauth.services.modules.smf',
     'allianceauth.services.modules.phpbb3',
     'allianceauth.services.modules.xenforo',
@@ -43,11 +41,6 @@ ROOT_URLCONF = 'tests.urls'
 
 CACHES['default'] = {'BACKEND': 'django.core.cache.backends.db.DatabaseCache'}
 
-#####################
-# Alliance Market
-#####################
-MARKET_URL = 'http://yourdomain.com/market'
-
 #####################
 # HR Configuration
 #####################
@@ -159,15 +152,6 @@ DISCOURSE_SSO_SECRET = 'd836444a9e4084d5b224a60c208dce14'
 IPS4_URL = 'http://example.com/ips4'
 IPS4_API_KEY = ''
 
-#####################################
-# SEAT Configuration
-#####################################
-# SEAT_URL - base url of the seat install (no trailing slash)
-# SEAT_XTOKEN - API key X-Token provided by SeAT
-#####################################
-SEAT_URL = 'http://example.com/seat'
-SEAT_XTOKEN = 'tokentokentoken'
-
 ######################################
 # SMF Configuration
 ######################################

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 skipsdist = true
 usedevelop = true
-envlist = py{35,36,37}-dj{2X}
+envlist = py{35,36,37,38}-dj{2X}
 
 [testenv]
 setenv =
@@ -10,11 +10,10 @@ basepython =
     py35: python3.5
     py36: python3.6
     py37: python3.7
+    py38: python3.8
 deps=    
     coverage
     dj2X: Django>=2.0,<3.0
-    py37: https://github.com/yaml/pyyaml/zipball/master#egg=pyyaml
-    py37: https://github.com/celery/kombu/zipball/master#egg=kombu
 install_command = pip install -e ".[testing]" -U {opts} {packages}
 commands = 
     coverage run runtests.py -v 2