Version Bump v2.8.1

Bump minimum django-esi and add User Agent header.

See merge request allianceauth/allianceauth!1275

.readthedocs.yml

@@ -18,10 +18,6 @@ formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-   version: 3.7
+  version: 3.7
-   install:      
+  install:
-      - method: pip
+    - requirements: docs/requirements.txt
-        path: .        
-        extra_requirements:
-           - testing
-   system_packages: true

allianceauth/__init__.py

@@ -1,7 +1,7 @@
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '2.8.0'
+__version__ = '2.8.1'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = '%s v%s' % (__title__, __version__)

allianceauth/eveonline/providers.py

@@ -7,6 +7,8 @@ from jsonschema.exceptions import RefResolutionError
 from django.conf import settings
 from esi.clients import esi_client_factory
 
+from allianceauth import __version__
+
 
 SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(
     os.path.abspath(__file__)), 'swagger.json'
@@ -166,7 +168,7 @@ class EveSwaggerProvider(EveProvider):
         else:
             try:
                 self._client = esi_client_factory(
-                    token=token, spec_file=SWAGGER_SPEC_PATH
+                    token=token, spec_file=SWAGGER_SPEC_PATH, app_info_text=("allianceauth v" + __version__)
                 )
             except (HTTPError, RefResolutionError):
                 logger.exception(
@@ -182,7 +184,7 @@ class EveSwaggerProvider(EveProvider):
     def client(self):
         if self._client is None:
             self._client = esi_client_factory(
-                token=self._token, spec_file=SWAGGER_SPEC_PATH
+                token=self._token, spec_file=SWAGGER_SPEC_PATH, app_info_text=("allianceauth v" + __version__)
             )
         return self._client
 

allianceauth/eveonline/tests/test_providers.py

@@ -592,3 +592,12 @@ class TestEveSwaggerProvider(TestCase):
         self.assertTrue(mock_esi_client_factory.called)
         self.assertIsNotNone(my_provider._client)
         self.assertEqual(my_client, 'my_client')
+
+    @patch(MODULE_PATH + '.__version__', '1.0.0')
+    def test_user_agent_header(self):
+        my_provider = EveSwaggerProvider()
+        my_client = my_provider.client
+        operation = my_client.Status.get_status()
+        self.assertEqual(
+            operation.future.request.headers['User-Agent'], 'allianceauth v1.0.0'
+        )

allianceauth/groupmanagement/auth_hooks.py

@@ -9,15 +9,20 @@ from .managers import GroupManager
 
 class GroupManagementMenuItem(MenuItemHook):
     """ This class ensures only authorized users will see the menu entry """
+
     def __init__(self):
         # setup menu entry for sidebar
         MenuItemHook.__init__(
             self,
-            text=_('Group Management'),
+            text=_("Group Management"),
-            classes='fas fa-users-cog fa-fw',
+            classes="fas fa-users-cog fa-fw",
-            url_name='groupmanagement:management',
+            url_name="groupmanagement:management",
             order=50,
-            navactive=['groupmanagement:management']
+            navactive=[
+                "groupmanagement:management",  # group requests view
+                "groupmanagement:membership",  # group membership view
+                "groupmanagement:audit_log",  # group audit log view
+            ],
         )
 
     def render(self, request):
@@ -25,14 +30,14 @@ class GroupManagementMenuItem(MenuItemHook):
             app_count = GroupManager.pending_requests_count_for_user(request.user)
             self.count = app_count if app_count and app_count > 0 else None
             return MenuItemHook.render(self, request)
-        return ''
+        return ""
 
 
-@hooks.register('menu_item_hook')
+@hooks.register("menu_item_hook")
 def register_menu():
     return GroupManagementMenuItem()
 
 
-@hooks.register('url_hook')
+@hooks.register("url_hook")
 def register_urls():
-    return UrlHook(urls, 'group', r'^group/')
+    return UrlHook(urls, "group", r"^groups/")

allianceauth/groupmanagement/migrations/0015_make_descriptions_great_again.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.1.2 on 2020-10-25 11:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("groupmanagement", "0014_auto_20200918_1412"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="authgroup",
+            name="description",
+            field=models.TextField(
+                blank=True,
+                help_text="Short description <i>(max. 512 characters)</i> of the group shown to users.",
+                max_length=512,
+            ),
+        ),
+    ]

allianceauth/groupmanagement/models.py

@@ -107,7 +107,7 @@ class AuthGroup(models.Model):
                                     help_text="States listed here will have the ability to join this group provided "
                                               "they have the proper permissions.")
 
-    description = models.CharField(max_length=512, blank=True, help_text="Description of the group shown to users.")
+    description = models.TextField(max_length=512, blank=True, help_text="Short description <i>(max. 512 characters)</i> of the group shown to users.")
 
     def __str__(self):
         return self.group.name

allianceauth/groupmanagement/templates/groupmanagement/audit.html

@@ -8,58 +8,65 @@
     <div class="col-lg-12">
         <br>
         {% include 'groupmanagement/menu.html' %}
+
         <div class="panel panel-default">
             <div class="panel-heading">
-                {{ group }} - {% trans 'Audit Log' %}
+                {{ group }} - {% trans "Audit Log" %}
             </div>
-            <div class="panel-body">            
+
-                <p> 
+            <div class="panel-body">
+                <p>
                     <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
                         {% trans "Back" %}
                     </a>
-                </p>              
+                </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 scope="col">{% trans "Date/Time" %}</th>
-                                <th class="text-center" scope="col">{% trans "Requestor" %}</th>
+                                <th scope="col">{% trans "Requestor" %}</th>
-                                <th class="text-center" scope="col">{% trans "Character" %}</th>
+                                <th scope="col">{% trans "Character" %}</th>
-                                <th class="text-center" scope="col">{% trans "Corporation" %}</th>
+                                <th scope="col">{% trans "Corporation" %}</th>
-                                <th class="text-center" scope="col">{% trans "Type" %}</th>
+                                <th scope="col">{% trans "Type" %}</th>
-                                <th class="text-center" scope="col">{% trans "Action" %}</th>
+                                <th scope="col">{% trans "Action" %}</th>
-                                <th class="text-center" scope="col">{% trans "Actor" %}</th>
+                                <th scope="col">{% trans "Actor" %}</th>
                             </thead>
+
                             <tbody>
                                 {% for entry in entries %}
                                     <tr>
-                                        <td class="text-center">{{ entry.date|date:"Y-M-d, H:i" }}</td>
+                                        <td>{{ entry.date|date:"Y-M-d, H:i" }}</td>
-                                        <td class="text-center">{{ entry.requestor }}</td>
+                                        <td>{{ entry.requestor }}</td>
-                                        <td class="text-center">{{ entry.req_char }}</td>
+                                        <td>{{ entry.req_char }}</td>
-                                        <td class="text-center">{{ entry.req_char.corporation_name }}</td>
+                                        <td>{{ entry.req_char.corporation_name }}</td>
-                                        <td class="text-center">{{ entry.type_to_str }}</td>
+                                        <td>{{ entry.type_to_str }}</td>
+
                                         {% if entry.request_type is None %}
-                                            <td class="text-center"> Removed</td>
+                                            <td>{% trans "Removed" %}</td>
                                         {% else %}
-                                            <td class="text-center">{{ entry.action_to_str }}</td>
+                                            <td>{{ entry.action_to_str }}</td>
                                         {% endif %}
-                                        <td class="text-center">{{ entry.request_actor }}</td>
+
+                                        <td>{{ entry.request_actor }}</td>
                                     </tr>
                                 {% endfor %}
                             </tbody>
                         </table>
+
                         <p class="text-muted">
-                            All times displayed are EVE/UTC.
+                            {% trans "All times displayed are EVE/UTC." %}
                         </p>
                     </div>
-                {% else %}                                        
+                {% else %}
                     <div class="clearfix"></div>
                     <br>
-                    <div class="alert alert-warning text-center">                        
+                    <div class="alert alert-warning text-center">
                         {% trans "No entries found for this group." %}
-                    </div>                    
+                    </div>
                 {% endif %}
-            </div>        
+            </div>
         </div>
     </div>
 {% endblock %}
@@ -75,31 +82,30 @@
 {% endblock %}
 
 {% block extra_script %}
-
+    $.fn.dataTable.moment = function(format, locale) {
-    $.fn.dataTable.moment = function ( format, locale ) {
         var types = $.fn.dataTable.ext.type;
-    
+
         // Add type detection
-        types.detect.unshift( function ( d ) {
+        types.detect.unshift(function(d) {
-            return moment( d, format, locale, true ).isValid() ?
+            return moment(d, format, locale, true).isValid() ?
                 'moment-'+format :
                 null;
-        } );
+        });
-    
+
         // Add sorting method - use an integer for the sorting
-        types.order[ 'moment-'+format+'-pre' ] = function ( d ) {
+        types.order[ 'moment-'+format+'-pre' ] = function(d) {
-            return moment( d, format, locale, true ).unix();
+            return moment(d, format, locale, true).unix();
         };
     };
 
     $(document).ready(function(){
-        $.fn.dataTable.moment( 'YYYY-MMM-D, HH:mm' );
+        $.fn.dataTable.moment('YYYY-MMM-D, HH:mm');
 
         $('#log-entries').DataTable({
-            order: [[ 0, 'desc' ], [ 1, 'asc' ] ],
+            order: [[0, 'desc'], [1, 'asc']],
             filterDropDown:
             {
-                columns: [                                       
+                columns: [
                     {
                         idx: 1
                     },
@@ -124,4 +130,3 @@
         });
     });
 {% endblock %}
-

allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html

@@ -9,38 +9,35 @@
     <div class="col-lg-12">
         <br>
         {% include 'groupmanagement/menu.html' %}
-        
+
         <div class="panel panel-default">
             <div class="panel-heading">
                 {{ group.name }} - {% trans 'Members' %}
             </div>
-            <div class="panel-body">                
+
-                <p>                    
+            <div class="panel-body">
+                <p>
                     <a class="btn btn-default" href="{% url 'groupmanagement:membership' %}" role="button">
                         {% trans "Back" %}
                     </a>
-                </p>                
+                </p>
-                {% if group.user_set %}                    
+
+                {% if group.user_set %}
                     <div class="table-responsive">
                         <table class="table table-aa" id="tab_group_members">
                             <thead>
-                                <tr>                                                        
+                                <tr>
-                                    <th class="text-right">{% trans "Portrait" %}</th>
+                                    <th>{% trans "Character" %}</th>
-                                    <th class="text-center">{% trans "Character" %}</th>
+                                    <th>{% trans "Organization" %}</th>
-                                    <th class="text-center">{% trans "Organization" %}</th>                                    
+                                    <th></th>
-                                    <th class="text-center"></th>
                                 </tr>
                             </thead>
+
                             <tbody>
                                 {% for member in members %}
-                                    <tr>                                                                
+                                    <tr>
-                                        <td class="text-right">
+                                        <td>
-                                            {% if member.is_leader %}
+                                            <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
-                                                <i class="fas fa-star"></i>&nbsp;
-                                            {% endif %}
-                                            <img src="{{ member.main_char|character_portrait_url:32 }}" class="img-circle">                                            
-                                        </td>
-                                        <td class="text-center">
                                             {% if member.main_char %}
                                                 <a href="{{ member.main_char|evewho_character_url }}" target="_blank">
                                                     {{ member.main_char.character_name }}
@@ -48,28 +45,36 @@
                                             {% else %}
                                                 {{ member.user.username }}
                                             {% endif %}
+
+                                            {% if member.is_leader %}
+                                                <i class="fas fa-star" title="{% trans "Group leader" %}" style="margin-left: 1rem;"></i>&nbsp;
+                                            {% endif %}
                                         </td>
-                                        <td class="text-center">
+
+                                        <td>
                                             {% if member.main_char %}
                                                 <a href="{{ member.main_char|dotlan_corporation_url }}" target="_blank">
                                                     {{ member.main_char.corporation_name }}
                                                 </a><br>
                                                 {{ member.main_char.alliance_name|default_if_none:"" }}
                                             {% else %}
-                                                (unknown)
+                                                {% trans "(unknown)" %}
                                             {% endif %}
-                                        </td>                                                                
+                                        </td>
-                                        <td class="text-center">
+
-                                            <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger"
+                                        <td class="text-right">
-                                                title="{% trans "Remove from group" %}">
+                                            <a href="{% url 'groupmanagement:membership_remove' group.id member.user.id %}" class="btn btn-danger" title="{% trans "Remove from group" %}">
-                                                    <i class="glyphicon glyphicon-remove"></i>
+                                                <i class="glyphicon glyphicon-remove"></i>
                                             </a>
                                         </td>
                                     </tr>
                                 {% endfor %}
                             </tbody>
                         </table>
-                        <p class="text-muted"><i class="fas fa-star"></i>: Group leader</p>
+
+                        <p class="text-muted">
+                            <i class="fas fa-star"></i>: {% trans "Group leader" %}
+                        </p>
                     </div>
                 {% else %}
                     <div class="alert alert-warning text-center">
@@ -77,7 +82,7 @@
                     </div>
                 {% endif %}
             </div>
-            
+
         </div>
     </div>
 {% endblock content %}
@@ -93,10 +98,13 @@
 {% block extra_script %}
     $(document).ready(function(){
         $('#tab_group_members').DataTable({
-            order: [ [ 1, "asc" ] ],
+            order: [[0, "asc"]],
             columnDefs: [
-                { "sortable": false, "targets": [0, 3] },
+                {
+                    "sortable": false,
+                    "targets": [2]
+                },
             ]
         });
     });
-{% endblock %}
+{% endblock %}

allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html

@@ -9,31 +9,36 @@
     <div class="col-lg-12">
         <br>
         {% include 'groupmanagement/menu.html' %}
+
         <div class="panel panel-default">
             <div class="panel-heading">
                 {% trans "Groups" %}
             </div>
+
             <div class="panel-body">
-                {% if groups %}                    
+                {% if groups %}
                     <div class="table-responsive">
                         <table class="table table-aa">
                             <thead>
                                 <tr>
-                                    <th class="text-center">{% trans "Name" %}</th>
+                                    <th>{% trans "Name" %}</th>
-                                    <th class="text-center">{% trans "Description" %}</th>
+                                    <th>{% trans "Description" %}</th>
-                                    <th class="text-center">{% trans "Status" %}</th>
+                                    <th>{% trans "Status" %}</th>
-                                    <th class="text-center">{% trans "Member Count" %}</th>
+                                    <th style="white-space: nowrap;">{% trans "Member Count" %}</th>
-                                    <th class="text-center"></th>
+                                    <th style="min-width: 170px;"></th>
                                 </tr>
                             </thead>
+
                             <tbody>
                                 {% for group in groups %}
                                     <tr>
-                                        <td class="text-center">
+                                        <td>
-                                            <a href="{% url 'groupmanagement:membership_list' group.id %}">{{ group.name }}</a>
+                                            <a href="{% url 'groupmanagement:membership' group.id %}">{{ group.name }}</a>
                                         </td>
-                                        <td class="text-center">{{ group.authgroup.description }}</td>
+
-                                        <td class="text-center">
+                                        <td>{{ group.authgroup.description|linebreaks|urlize }}</td>
+
+                                        <td>
                                             {% if group.authgroup.hidden %}
                                                 <span class="label label-info">{% trans "Hidden" %}</span>
                                             {% elif group.authgroup.open %}
@@ -42,21 +47,23 @@
                                                 <span class="label label-default">{% trans "Requestable" %}</span>
                                             {% endif %}
                                         </td>
-                                        <td class="text-center">
+
+                                        <td class="text-right">
                                             {{ group.num_members }}
                                         </td>
-                                        <td class="text-center">
+
-                                            <a href="{% url 'groupmanagement:membership_list' group.id %}" class="btn btn-primary"
+                                        <td class="text-right">
-                                                title="{% trans "View Members" %}">
+                                            <a href="{% url 'groupmanagement:membership' group.id %}" class="btn btn-primary" title="{% trans "View Members" %}">
-                                                    <i class="glyphicon glyphicon-eye-open"></i>
+                                                <i class="glyphicon glyphicon-eye-open"></i>
                                             </a>
+
                                             <a href="{% url "groupmanagement:audit_log" group.id %}" class="btn btn-info" title="{% trans "Audit Members" %}">
                                                 <i class="glyphicon glyphicon-list-alt"></i>
                                             </a>
+
                                             <a id="clipboard-copy" data-clipboard-text="{{ request.scheme }}://{{request.get_host}}{% url 'groupmanagement:request_add' group.id %}" class="btn btn-warning" title="{% trans "Copy Direct Join Link" %}">
                                                 <i class="glyphicon glyphicon-copy"></i>
                                             </a>
-
                                         </td>
                                     </tr>
                                 {% endfor %}
@@ -72,9 +79,11 @@
         </div>
     </div>
 {% endblock content %}
-{% block extra_javascript %}    
+
+{% block extra_javascript %}
     {% include 'bundles/clipboard-js.html' %}
-<script>
+
-    new ClipboardJS('#clipboard-copy');
+    <script>
-</script>
+        new ClipboardJS('#clipboard-copy');
-{% endblock %}
+    </script>
+{% endblock %}

allianceauth/groupmanagement/templates/groupmanagement/groups.html

@@ -4,7 +4,7 @@
 
 {% block page_title %}{% trans "Available Groups" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
-url
+
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% trans "Available Groups" %}</h1>
@@ -12,17 +12,18 @@ url
             <table class="table table-aa">
                 <thead>
                     <tr>
-                        <th class="text-center">{% trans "Name" %}</th>
+                        <th>{% trans "Name" %}</th>
-                        <th class="text-center">{% trans "Description" %}</th>
+                        <th>{% trans "Description" %}</th>
-                        <th class="text-center">{% trans "Action" %}</th>
+                        <th></th>
                     </tr>
                 </thead>
+
                 <tbody>
                     {% for g in groups %}
                         <tr>
-                            <td class="text-center">{{ g.group.name }}</td>
+                            <td>{{ g.group.name }}</td>
-                            <td class="text-center">{{ g.group.authgroup.description|urlize }}</td>
+                            <td>{{ g.group.authgroup.description|linebreaks|urlize }}</td>
-                            <td class="text-center">
+                            <td class="text-right">
                                 {% if g.group in user.groups.all %}
                                     {% if not g.request %}
                                         <a href="{% url 'groupmanagement:request_leave' g.group.id %}" class="btn btn-danger">
@@ -59,5 +60,4 @@ url
             </div>
         {% endif %}
     </div>
-
 {% endblock content %}

allianceauth/groupmanagement/templates/groupmanagement/index.html

@@ -4,25 +4,26 @@
 {% load evelinks %}
 
 {% block page_title %}{% trans "Groups Management" %}{% endblock page_title %}
-{% block extra_css %}
-<style>    
-    .nav-tabs>li.active>a {
-        background-color: #ECF0F1 !important;
-        color: #2C3E50;
-    }
-</style>
 
+{% block extra_css %}
+    <style>
+        .nav-tabs > li.active > a {
+            background-color: rgb(236, 240, 241) !important;
+            color: rgb(44, 62, 80);
+        }
+    </style>
 {% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
         <br>
         {% include 'groupmanagement/menu.html' %}
-        
+
         <ul class="nav nav-tabs">
             <li class="active">
                 <a data-toggle="tab" href="#add">
-                    {% trans "Join Requests" %} 
+                    {% trans "Join Requests" %}
+
                     {% if acceptrequests %}
                         <span class="badge">{{ acceptrequests|length }}</span>
                     {% endif %}
@@ -31,133 +32,130 @@
             <li>
                 <a data-toggle="tab" href="#leave">
                     {% trans "Leave Requests" %}
+
                     {% if leaverequests %}
                         <span class="badge">{{ leaverequests|length }}</span>
                     {% endif %}
                 </a>
             </li>
         </ul>
-        
-        <div class="tab-content">
 
+        <div class="tab-content">
             <div id="add" class="tab-pane fade in active panel panel-default">
                 <div class="panel-body">
-                {% if acceptrequests %}
+                    {% if acceptrequests %}
-                    <div class="table-responsive">
+                        <div class="table-responsive">
-                        <table class="table table-aa">
+                            <table class="table table-aa">
-                            <thead>
+                                <thead>
-                                <tr>                                    
+                                    <tr>
-                                    <th class="text-center"></th>
+                                        <th>{% trans "Character" %}</th>
-                                    <th class="text-center">{% trans "Character" %}</th>
+                                        <th>{% trans "Organization" %}</th>
-                                    <th class="text-center">{% trans "Organization" %}</th>                                    
+                                        <th>{% trans "Group" %}</th>
-                                    <th class="text-center">{% trans "Group" %}</th>
+                                        <th></th>
-                                    <th class="text-center"></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for acceptrequest in acceptrequests %}
-                                    <tr>                                        
-                                        <td class="text-right">
-                                            <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle">
-                                        </td>
-                                        <td class="text-center">                                          
-                                            {% if acceptrequest.main_char %}
-                                                <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
-                                                    {{ acceptrequest.main_char.character_name }}
-                                                </a>
-                                            {% else %}
-                                                {{ acceptrequest.user.username }}
-                                            {% endif %}
-                                        </td>
-                                        <td class="text-center">
-                                            {% if acceptrequest.main_char %}
-                                                <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                    {{ acceptrequest.main_char.corporation_name }}
-                                                </a><br>
-                                                {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
-                                            {% else %}
-                                                (unknown)
-                                            {% endif %}
-                                        </td>                                        
-                                        <td class="text-center">{{ acceptrequest.group.name }}</td>
-                                        <td class="text-center">
-                                            <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
-                                                {% trans "Accept" %}
-                                            </a>
-                                            <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
-                                                {% trans "Reject" %}
-                                            </a>
-                                        </td>
                                     </tr>
-                                {% endfor %}
+                                </thead>
-                            </tbody>
+
-                        </table>
+                                <tbody>
-                    </div>
+                                    {% for acceptrequest in acceptrequests %}
-                {% else %}
+                                        <tr>
-                    <div class="alert alert-warning text-center">{% trans "No group add requests." %}</div>
+                                            <td>
-                {% endif %}
+                                                <img src="{{ acceptrequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
+                                                {% if acceptrequest.main_char %}
+                                                    <a href="{{ acceptrequest.main_char|evewho_character_url }}" target="_blank">
+                                                        {{ acceptrequest.main_char.character_name }}
+                                                    </a>
+                                                {% else %}
+                                                    {{ acceptrequest.user.username }}
+                                                {% endif %}
+                                            </td>
+                                            <td>
+                                                {% if acceptrequest.main_char %}
+                                                    <a href="{{ acceptrequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                        {{ acceptrequest.main_char.corporation_name }}
+                                                    </a><br>
+                                                    {{ acceptrequest.main_char.alliance_name|default_if_none:"" }}
+                                                {% else %}
+                                                    {% trans "(unknown)" %}
+                                                {% endif %}
+                                            </td>
+                                            <td>{{ acceptrequest.group.name }}</td>
+                                            <td class="text-right">
+                                                <a href="{% url 'groupmanagement:accept_request' acceptrequest.id %}" class="btn btn-success">
+                                                    {% trans "Accept" %}
+                                                </a>
+
+                                                <a href="{% url 'groupmanagement:reject_request' acceptrequest.id %}" class="btn btn-danger">
+                                                    {% trans "Reject" %}
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
+                    {% else %}
+                        <div class="alert alert-warning text-center">{% trans "No group add requests." %}</div>
+                    {% endif %}
                 </div>
             </div>
 
             <div id="leave" class="tab-pane fade panel panel-default">
                 <div class="panel-body">
-                {% if leaverequests %}
+                    {% if leaverequests %}
-                    <div class="table-responsive">
+                        <div class="table-responsive">
-                        <table class="table table-aa">
+                            <table class="table table-aa">
-                            <thead>
+                                <thead>
-                                <tr>                                    
+                                    <tr>
-                                    <th class="text-center"></th>
+                                        <th>{% trans "Character" %}</th>
-                                    <th class="text-center">{% trans "Character" %}</th>
+                                        <th>{% trans "Organization" %}</th>
-                                    <th class="text-center">{% trans "Organization" %}</th>                                    
+                                        <th>{% trans "Group" %}</th>
-                                    <th class="text-center">{% trans "Group" %}</th>
+                                        <th></th>
-                                    <th class="text-center"></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for leaverequest in leaverequests %}
-                                    <tr>                                        
-                                        <td class="text-right">
-                                            <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle">
-                                        </td>
-                                        <td class="text-center">
-                                            {% if leaverequest.main_char %}
-                                                <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
-                                                    {{ leaverequest.main_char.character_name }}
-                                                </a>
-                                            {% else %}
-                                                {{ leaverequest.user.username }}
-                                            {% endif %}
-                                        </td>
-                                        <td class="text-center">
-                                            {% if leaverequest.main_char %}
-                                                <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
-                                                    {{ leaverequest.main_char.corporation_name }}
-                                                </a><br>
-                                                {{ leaverequest.main_char.alliance_name|default_if_none:"" }}                               
-                                            {% else %}
-                                                (unknown)
-                                            {% endif %}
-                                        </td>                                        
-                                        <td class="text-center">{{ leaverequest.group.name }}</td>
-                                        <td class="text-center">
-                                            <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
-                                                {% trans "Accept" %}
-                                            </a>
-                                            <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
-                                                {% trans "Reject" %}
-                                            </a>
-                                        </td>
                                     </tr>
-                                {% endfor %}
+                                </thead>
-                            </tbody>
+
-                        </table>
+                                <tbody>
-                    </div>
+                                    {% for leaverequest in leaverequests %}
-                {% else %}
+                                        <tr>
-                    <div class="alert alert-warning text-center">{% trans "No group leave requests." %}</div>
+                                            <td>
-                {% endif %}
+                                                <img src="{{ leaverequest.main_char|character_portrait_url:32 }}" class="img-circle" style="margin-right: 1rem;">
+                                                {% if leaverequest.main_char %}
+                                                    <a href="{{ leaverequest.main_char|evewho_character_url }}" target="_blank">
+                                                        {{ leaverequest.main_char.character_name }}
+                                                    </a>
+                                                {% else %}
+                                                    {{ leaverequest.user.username }}
+                                                {% endif %}
+                                            </td>
+                                            <td>
+                                                {% if leaverequest.main_char %}
+                                                    <a href="{{ leaverequest.main_char|dotlan_corporation_url }}" target="_blank">
+                                                        {{ leaverequest.main_char.corporation_name }}
+                                                    </a><br>
+                                                    {{ leaverequest.main_char.alliance_name|default_if_none:"" }}
+                                                {% else %}
+                                                    {% trans "(unknown)" %}
+                                                {% endif %}
+                                            </td>
+                                            <td>{{ leaverequest.group.name }}</td>
+                                            <td class="text-right">
+                                                <a href="{% url 'groupmanagement:leave_accept_request' leaverequest.id %}" class="btn btn-success">
+                                                    {% trans "Accept" %}
+                                                </a>
+
+                                                <a href="{% url 'groupmanagement:leave_reject_request' leaverequest.id %}" class="btn btn-danger">
+                                                    {% trans "Reject" %}
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                        </div>
+                    {% else %}
+                        <div class="alert alert-warning text-center">{% trans "No group leave requests." %}</div>
+                    {% endif %}
                 </div>
             </div>
-            
         </div>
     </div>
 {% endblock content %}

allianceauth/groupmanagement/templates/groupmanagement/menu.html

@@ -4,7 +4,6 @@
 
 <nav class="navbar navbar-default">
     <div class="container-fluid">
-
         <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
                 <span class="sr-only">{% trans "Toggle navigation" %}</span>
@@ -12,7 +11,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="">{% trans "Group Management" %}</a>
+            <a class="navbar-brand" href="{% url 'groupmanagement:management' %}">{% trans "Group Management" %}</a>
         </div>
 
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -20,11 +19,10 @@
                 <li class="{% navactive request 'groupmanagement:management' %}">
                     <a href="{% url 'groupmanagement:management' %}">{% trans "Group Requests" %}</a>
                 </li>
-                <li class="{% renavactive request '^/group/membership/' %}">
+                <li class="{% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}">
                     <a href="{% url 'groupmanagement:membership' %}">{% trans "Group Membership" %}</a>
                 </li>
             </ul>
         </div>
-        
     </div>
 </nav>

allianceauth/groupmanagement/urls.py

@@ -1,29 +1,52 @@
 from . import views
 
 from django.conf.urls import url
-app_name = 'groupmanagement'
+
+app_name = "groupmanagement"
 
 urlpatterns = [
-    url(r'^groups/', views.groups_view, name='groups'),    
+    # groups
-    url(r'^management/', views.group_management,
+    url(r"^groups/$", views.groups_view, name="groups"),
-        name='management'),
+    url(r"^group/request/join/(\w+)/$", views.group_request_add, name="request_add"),
-    url(r'^membership/$', views.group_membership,
+    url(
-        name='membership'),
+        r"^group/request/leave/(\w+)/$", views.group_request_leave, name="request_leave"
-    url(r'^membership/(\w+)/$', views.group_membership_list,
+    ),
-        name='membership_list'),
+    # group management
-    url(r'^membership/(\w+)/audit/$', views.group_membership_audit, name="audit_log"),
+    url(r"^groupmanagement/requests/$", views.group_management, name="management"),
-    url(r'^membership/(\w+)/remove/(\w+)/$', views.group_membership_remove,
+    url(r"^groupmanagement/membership/$", views.group_membership, name="membership"),
-        name='membership_remove'),
+    url(
-    url(r'^request_add/(\w+)', views.group_request_add,
+        r"^groupmanagement/membership/(\w+)/$",
-        name='request_add'),
+        views.group_membership_list,
-    url(r'^request/accept/(\w+)', views.group_accept_request,
+        name="membership",
-        name='accept_request'),
+    ),
-    url(r'^request/reject/(\w+)', views.group_reject_request,
+    url(
-        name='reject_request'),
+        r"^groupmanagement/membership/(\w+)/audit-log/$",
-    url(r'^request_leave/(\w+)', views.group_request_leave,
+        views.group_membership_audit,
-        name='request_leave'),
+        name="audit_log",
-    url(r'leave_request/accept/(\w+)', views.group_leave_accept_request,
+    ),
-        name='leave_accept_request'),
+    url(
-    url(r'^leave_request/reject/(\w+)', views.group_leave_reject_request,
+        r"^groupmanagement/membership/(\w+)/remove/(\w+)/$",
-        name='leave_reject_request'),
+        views.group_membership_remove,
+        name="membership_remove",
+    ),
+    url(
+        r"^groupmanagement/request/join/accept/(\w+)/$",
+        views.group_accept_request,
+        name="accept_request",
+    ),
+    url(
+        r"^groupmanagement/request/join/reject/(\w+)/$",
+        views.group_reject_request,
+        name="reject_request",
+    ),
+    url(
+        r"^groupmanagement/request/leave/accept/(\w+)/$",
+        views.group_leave_accept_request,
+        name="leave_accept_request",
+    ),
+    url(
+        r"^groupmanagement/request/leave/reject/(\w+)/$",
+        views.group_leave_reject_request,
+        name="leave_reject_request",
+    ),
 ]

allianceauth/groupmanagement/views.py

@@ -103,7 +103,7 @@ def group_membership_list(request, group_id):
 
         # Check its a joinable group i.e. not corp or internal
         # And the user has permission to manage it
-        if (not GroupManager.check_internal_group(group) 
+        if (not GroupManager.check_internal_group(group)
             or not GroupManager.can_manage_group(request.user, group)
         ):
             logger.warning(
@@ -132,7 +132,7 @@ def group_membership_list(request, group_id):
     render_items = {'group': group, 'members': members}
 
     return render(
-        request, 'groupmanagement/groupmembers.html', 
+        request, 'groupmanagement/groupmembers.html',
         context=render_items
     )
 
@@ -166,7 +166,7 @@ def group_membership_remove(request, group_id, user_id):
     except ObjectDoesNotExist:
         messages.warning(request, _("Group does not exist"))
 
-    return redirect('groupmanagement:membership_list', group_id)
+    return redirect('groupmanagement:membership', group_id)
 
 
 @login_required
@@ -312,18 +312,18 @@ def group_leave_reject_request(request, group_request_id):
 @login_required
 def groups_view(request):
     logger.debug("groups_view called by user %s" % request.user)
-    
+
     groups_qs = GroupManager.get_joinable_groups_for_user(
         request.user, include_hidden=False
     )
     groups_qs = groups_qs.order_by('name')
     groups = []
-    for group in groups_qs:        
+    for group in groups_qs:
         group_request = GroupRequest.objects\
             .filter(user=request.user)\
             .filter(group=group)
         groups.append({
-            'group': group, 
+            'group': group,
             'request': group_request[0] if group_request else None
         })
 

allianceauth/project_template/project_name/celery.py

@@ -1,5 +1,6 @@
 import os
 from celery import Celery
+from celery.app import trace
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', '{{ project_name }}.settings.local')
@@ -27,3 +28,6 @@ app.conf.ONCE = {
 
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+
+# Remove result from default log message on task success
+trace.LOG_SUCCESS = "Task %(name)s[%(id)s] succeeded in %(runtime)ss"

allianceauth/project_template/project_name/settings/local.py

@@ -45,6 +45,7 @@ DATABASES['default'] = {
 ESI_SSO_CLIENT_ID = ''
 ESI_SSO_CLIENT_SECRET = ''
 ESI_SSO_CALLBACK_URL = ''
+ESI_USER_CONTACT_EMAIL = ''    # A server maintainer that CCP can contact in case of issues.
 
 # By default emails are validated before new users can log in.
 # It's recommended to use a free service like SparkPost or Elastic Email to send email.

docs/installation/allianceauth.md

@@ -181,6 +181,8 @@ For **scopes** your SSO app needs to have at least `publicData`. Additional scop
 
 As **callback URL** you want to define the URL of your Alliance Auth site plus the route: `/sso/callback`. Example for a valid callback URL: `https://auth.example.com/sso/callback`
 
+In `local.py` you will need to set `ESI_USER_CONTACT_EMAIL` to an email address to ensure that CCP has reliable contact information for you.
+
 ### Alliance Auth Project
 
 Ensure wheel is available before continuing:

docs/requirements.txt

@@ -1,3 +1,16 @@
-sphinx=>3.2.1,<4.0.0
+# Docs Specific Packages
-sphinx_rtd_theme=0.5.0
+sphinx>=3.2.1,<4.0.0
-recommonmark=0.6.0
+sphinx_rtd_theme==0.5.0
+recommonmark==0.6.0
+
+# Autodoc dependencies
+django>=3.1.1,<4.0.0
+django-celery-beat>=2.0.0
+django-bootstrap-form
+django-sortedm2m
+django-esi>=1.5,<3.0
+celery>=4.3.0,<5.0.0,!=4.4.4
+celery_once
+passlib
+redis>=3.3.1,<4.0.0
+django-nose

setup.py

@@ -33,7 +33,7 @@ install_requires = [
     'sleekxmpp',
     'pydiscourse',
 
-    'django-esi>=1.5,<3.0'
+    'django-esi>=2.0.4,<3.0'
 ]
 
 testing_extras = [