Adarnof's Little Things (#547)

* Port to Django 1.10
Initial migrations for current states of all models. Requires faking to retain data.
Removed all references to render_to_response, replacing with render shortcut.
Same for HttpResponseRedirect to render shortcut.
Corrected notification signal import to wait for app registry to finish loading.

* Correct typos from render conversion

* Modify models to suppress Django field warnings

* Script for automatic database conversion
 - fakes initial migrations to preserve data
Include LOGIN_URL setting

* Correct context processor import typo

* Removed pathfinder support.
Current pathfinder versions require SSO, not APIs added to database.
Conditionally load additional database definitions only if services are enabled.
Prevents errors when running auth without creating all possible databases.

* Condense context processors

* Include Django 1.10 installation in migrate script
Remove syncdb/evolve, replace with migrate for update script

* Replaced member/blue perms with user state system
Removed sigtracker
Initial migrations for default perms and groups
Removed perm bootstrapping on first run

* Clean up services list

* Remove fleet fittings page

* Provide action feedback via django messaging
Display unread notification count
Correct left navbar alignment

* Stop storing service passwords.
Provide them one time upon activation or reset.
Closes #177

* Add group sync buttons to admin site
Allow searcing of AuthServicesInfo models
Display user main character

* Correct button CSS to remove underlines on hover

* Added bulk actions to notifications
Altered notification default ordering

* Centralize API key validation.
Remove unused error count on API key model.
Restructure API key refresh task to queue all keys per user and await completion.
Closes #350

* Example configuration files for supervisor.
Copy to /etc/supervisor/conf.d and restart to take effect.
Closes #521
Closes #266

* Pre-save receiver for member/blue state switching
Removed is_blue field
Added link to admin site

* Remove all hardcoded URLs from views and templates
Correct missing render arguments
Closes #540

* Correct celeryd process directory

* Migration to automatically set user states.
Runs instead of waiting for next API refresh cycle. Should make the transition much easier.

* Verify service accounts accessible to member state

* Restructure project to remove unnecessary apps.
(celerytask, util, portal, registraion apps)
Added workarounds for python 3 compatibility.

* Correct python2 compatibility

* Check services against state being changed to

* Python3 compatibility fixes

* Relocate x2bool py3 fix

* SSO integration for logging in to existing accounts.

* Add missing url names for fleetup reverse

* Sanitize groupnames before syncing.

* Correct trailing slash preventing url resolution

* Alter group name sanitization to allow periods and hyphens

* Correct state check on pre_save model for corp/alliance group assignment

* Remove sigtracker table from old dbs to allow user deletion

* Include missing celery configuration

* Teamspeak error handling

* Prevent celery worker deadlock on async group result wait

* Correct active navbar links for translated urls.
Correct corp status url resolution for some links.
Remove DiscordAuthToken model.

fleetactivitytracking/__init__.py

@@ -0,0 +1 @@
+from __future__ import unicode_literals

fleetactivitytracking/admin.py

@@ -1,5 +1,6 @@
+from __future__ import unicode_literals
 from django.contrib import admin
-from models import Fatlink, Fat
+from fleetactivitytracking.models import Fatlink, Fat
 
 
 admin.site.register(Fatlink)

fleetactivitytracking/apps.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class FatConfig(AppConfig):
+    name = 'fleetactivitytracking'

fleetactivitytracking/forms.py

@@ -1,7 +1,9 @@
+from __future__ import unicode_literals
 from django import forms
 from optimer.models import optimer
 from django.utils.translation import ugettext_lazy as _
 
+
 def get_fleet_list():
     fleets = optimer.objects.all()
     fleetlist = [("None", "None")]
@@ -13,5 +15,6 @@ def get_fleet_list():
 
 class FatlinkForm(forms.Form):
     fatname = forms.CharField(label=_('Name of fat-link'), required=True)
-    duration = forms.IntegerField(label=_("Duration of fat-link"), required=True, initial=30, min_value=1, max_value=2147483647)
-    fleet = forms.ModelChoiceField(label=_("Fleet"), queryset=optimer.objects.all().order_by('operation_name'))
+    duration = forms.IntegerField(label=_("Duration of fat-link"), required=True, initial=30, min_value=1,
+                                  max_value=2147483647)
+    fleet = forms.ModelChoiceField(label=_("Fleet"), queryset=optimer.objects.all().order_by('operation_name'))

fleetactivitytracking/migrations/0001_initial.py

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-05 21:39
+from __future__ import unicode_literals
+
+import datetime
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+from django.utils.timezone import utc
+import fleetactivitytracking.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('eveonline', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Fat',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('system', models.CharField(max_length=30)),
+                ('shiptype', models.CharField(max_length=30)),
+                ('station', models.CharField(max_length=125)),
+                ('character', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eveonline.EveCharacter')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Fatlink',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fatdatetime', models.DateTimeField(default=datetime.datetime(2016, 9, 5, 21, 39, 17, 307954, tzinfo=utc))),
+                ('duration', models.PositiveIntegerField()),
+                ('fleet', models.CharField(default=b'', max_length=254)),
+                ('name', models.CharField(max_length=254)),
+                ('hash', models.CharField(max_length=254, unique=True)),
+                ('creator', models.ForeignKey(on_delete=models.SET(fleetactivitytracking.models.get_sentinel_user), to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='fat',
+            name='fatlink',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fleetactivitytracking.Fatlink'),
+        ),
+        migrations.AddField(
+            model_name='fat',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterUniqueTogether(
+            name='fat',
+            unique_together=set([('character', 'fatlink')]),
+        ),
+    ]

fleetactivitytracking/migrations/0002_auto_20160905_2220.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-05 22:20
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleetactivitytracking', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='fatlink',
+            name='fatdatetime',
+            field=models.DateTimeField(default=datetime.datetime(2016, 9, 5, 22, 20, 2, 999041, tzinfo=utc)),
+        ),
+    ]

fleetactivitytracking/migrations/0003_auto_20160906_2354.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-06 23:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleetactivitytracking', '0002_auto_20160905_2220'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='fatlink',
+            name='fatdatetime',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

fleetactivitytracking/models.py

@@ -1,16 +1,18 @@
+from __future__ import unicode_literals
+from django.utils.encoding import python_2_unicode_compatible
 from django.db import models
 from django.contrib.auth.models import User
-from optimer.models import optimer
 from eveonline.models import EveCharacter
-from datetime import datetime
-from datetime import date
 from django.utils import timezone
 
+
 def get_sentinel_user():
     return User.objects.get_or_create(username='deleted')[0]
 
+
+@python_2_unicode_compatible
 class Fatlink(models.Model):
-    fatdatetime = models.DateTimeField(default=timezone.now())
+    fatdatetime = models.DateTimeField(default=timezone.now)
     duration = models.PositiveIntegerField()
     fleet = models.CharField(max_length=254, default="")
     name = models.CharField(max_length=254)
@@ -21,6 +23,7 @@ class Fatlink(models.Model):
         return self.name
 
 
+@python_2_unicode_compatible
 class Fat(models.Model):
     character = models.ForeignKey(EveCharacter, on_delete=models.CASCADE)
     fatlink = models.ForeignKey(Fatlink)

fleetactivitytracking/views.py

@@ -1,19 +1,17 @@
+from __future__ import unicode_literals
 from django.conf import settings
-from django.shortcuts import HttpResponseRedirect
-from django.shortcuts import render_to_response
+from django.shortcuts import render, redirect
 from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
-from django.template import RequestContext
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 
 from eveonline.models import EveCharacter
 from eveonline.models import EveCorporationInfo
 from eveonline.managers import EveManager
-from util import check_if_user_has_permission
-from forms import FatlinkForm
-from models import Fatlink, Fat
+from fleetactivitytracking.forms import FatlinkForm
+from fleetactivitytracking.models import Fatlink, Fat
 
 from slugify import slugify
 
@@ -23,7 +21,6 @@ import string
 import random
 import datetime
 
-
 import logging
 
 logger = logging.getLogger(__name__)
@@ -34,24 +31,26 @@ class CorpStat(object):
         if corp:
             self.corp = corp
         else:
-           self.corp = EveCorporationInfo.objects.get(corporation_id=corp_id)
+            self.corp = EveCorporationInfo.objects.get(corporation_id=corp_id)
         self.n_fats = 0
         self.blue = blue
 
     def avg_fat(self):
-        return "%.2f" % (float(self.n_fats)/float(self.corp.member_count))
+        return "%.2f" % (float(self.n_fats) / float(self.corp.member_count))
+
 
 def first_day_of_next_month(year, month):
     if month == 12:
-        return datetime.datetime(year+1,1,1)
+        return datetime.datetime(year + 1, 1, 1)
     else:
-        return datetime.datetime(year, month+1, 1)
+        return datetime.datetime(year, month + 1, 1)
+
 
 def first_day_of_previous_month(year, month):
     if month == 1:
-        return datetime.datetime(year-1,12,1)
+        return datetime.datetime(year - 1, 12, 1)
     else:
-        return datetime.datetime(year, month-1, 1)
+        return datetime.datetime(year, month - 1, 1)
 
 
 @login_required
@@ -63,14 +62,14 @@ def fatlink_view(request):
     logger.debug("fatlink_view called by user %s" % request.user)
 
     latest_fats = Fat.objects.filter(user=user).order_by('-id')[:5]
-    if check_if_user_has_permission(user, 'fleetactivitytracking'):
+    if user.has_perm('auth.fleetactivitytracking'):
         latest_links = Fatlink.objects.all().order_by('-id')[:5]
-        context = {'user':user, 'fats': latest_fats, 'fatlinks': latest_links}
+        context = {'user': user, 'fats': latest_fats, 'fatlinks': latest_links}
 
     else:
-        context = {'user':user, 'fats': latest_fats}
+        context = {'user': user, 'fats': latest_fats}
 
-    return render_to_response('registered/fatlinkview.html', context, context_instance=RequestContext(request))
+    return render(request, 'registered/fatlinkview.html', context=context)
 
 
 @login_required
@@ -91,7 +90,8 @@ def fatlink_statistics_view(request, year=datetime.date.today().year, month=date
         for corp in alliance_corps:
             fatStats[corp.corporation_name] = CorpStat(corp.corporation_id, corp=corp)
 
-    fatlinks_in_span = Fatlink.objects.filter(fatdatetime__gte = start_of_month).filter(fatdatetime__lt = start_of_next_month)
+    fatlinks_in_span = Fatlink.objects.filter(fatdatetime__gte=start_of_month).filter(
+        fatdatetime__lt=start_of_next_month)
 
     for fatlink in fatlinks_in_span:
         fats_in_fatlink = Fat.objects.filter(fatlink=fatlink)
@@ -102,15 +102,16 @@ def fatlink_statistics_view(request, year=datetime.date.today().year, month=date
 
     fatStatsList = [fatStat for corp_name, fatStat in fatStats.items()]
     fatStatsList.sort(key=lambda stat: stat.corp.corporation_name)
-    fatStatsList.sort(key=lambda stat: (stat.n_fats, stat.n_fats/stat.corp.member_count), reverse=True)
+    fatStatsList.sort(key=lambda stat: (stat.n_fats, stat.n_fats / stat.corp.member_count), reverse=True)
 
     if datetime.datetime.now() > start_of_next_month:
-        context = {'fatStats':fatStatsList, 'month':start_of_month.strftime("%B"), 'year':year, 'previous_month': start_of_previous_month,'next_month': start_of_next_month}
+        context = {'fatStats': fatStatsList, 'month': start_of_month.strftime("%B"), 'year': year,
+                   'previous_month': start_of_previous_month, 'next_month': start_of_next_month}
     else:
-        context = {'fatStats':fatStatsList, 'month':start_of_month.strftime("%B"), 'year':year, 'previous_month': start_of_previous_month}
-
-    return render_to_response('registered/fatlinkstatisticsview.html', context, context_instance=RequestContext(request))
+        context = {'fatStats': fatStatsList, 'month': start_of_month.strftime("%B"), 'year': year,
+                   'previous_month': start_of_previous_month}
 
+    return render(request, 'registered/fatlinkstatisticsview.html', context=context)
 
 
 @login_required
@@ -123,21 +124,22 @@ def fatlink_personal_statistics_view(request, year=datetime.date.today().year, m
 
     personal_fats = Fat.objects.filter(user=user).order_by('id')
 
-    monthlystats = [0 for month in range(1,13)]
+    monthlystats = [0 for month in range(1, 13)]
 
     for fat in personal_fats:
         fatdate = fat.fatlink.fatdatetime
         if fatdate.year == year:
-            monthlystats[fatdate.month-1] += 1
+            monthlystats[fatdate.month - 1] += 1
 
-    monthlystats = [(i+1, datetime.date(year, i+1, 1).strftime("%h"), monthlystats[i]) for i in range(12)]
+    monthlystats = [(i + 1, datetime.date(year, i + 1, 1).strftime("%h"), monthlystats[i]) for i in range(12)]
 
-    if datetime.datetime.now() > datetime.datetime(year+1, 1, 1):
-        context = {'user':user, 'monthlystats': monthlystats, 'year':year, 'previous_year':year-1, 'next_year':year+1}
+    if datetime.datetime.now() > datetime.datetime(year + 1, 1, 1):
+        context = {'user': user, 'monthlystats': monthlystats, 'year': year, 'previous_year': year - 1,
+                   'next_year': year + 1}
     else:
-        context = {'user':user, 'monthlystats': monthlystats, 'year':year, 'previous_year':year-1}
+        context = {'user': user, 'monthlystats': monthlystats, 'year': year, 'previous_year': year - 1}
 
-    return render_to_response('registered/fatlinkpersonalstatisticsview.html', context, context_instance=RequestContext(request))
+    return render(request, 'registered/fatlinkpersonalstatisticsview.html', context=context)
 
 
 @login_required
@@ -148,28 +150,30 @@ def fatlink_monthly_personal_statistics_view(request, year, month, char_id=None)
     start_of_next_month = first_day_of_next_month(year, month)
     start_of_previous_month = first_day_of_previous_month(year, month)
 
-    if check_if_user_has_permission(request.user, 'fleetactivitytracking_statistics') and char_id:
+    if request.user.has_perm('auth.fleetactivitytracking_statistics') and char_id:
         user = EveCharacter.objects.get(character_id=char_id).user
     else:
         user = request.user
     logger.debug("Personal monthly statistics view for user %s called by %s" % (user, request.user))
 
-    personal_fats = Fat.objects.filter(user=user).filter(fatlink__fatdatetime__gte = start_of_month).filter(fatlink__fatdatetime__lt = start_of_next_month)
+    personal_fats = Fat.objects.filter(user=user).filter(fatlink__fatdatetime__gte=start_of_month).filter(
+        fatlink__fatdatetime__lt=start_of_next_month)
 
     ship_statistics = dict()
     n_fats = 0
     for fat in personal_fats:
         ship_statistics[fat.shiptype] = ship_statistics.setdefault(fat.shiptype, 0) + 1
         n_fats += 1
-    context = {'user': user, 'shipStats':sorted(ship_statistics.items()), 'month':start_of_month.strftime("%h"),
-               'year':year, 'n_fats': n_fats, 'char_id': char_id, 'previous_month': start_of_previous_month,
+    context = {'user': user, 'shipStats': sorted(ship_statistics.items()), 'month': start_of_month.strftime("%h"),
+               'year': year, 'n_fats': n_fats, 'char_id': char_id, 'previous_month': start_of_previous_month,
                'next_month': start_of_next_month}
 
-    created_fats = Fatlink.objects.filter(creator=user).filter(fatdatetime__gte = start_of_month).filter(fatdatetime__lt = start_of_next_month)
+    created_fats = Fatlink.objects.filter(creator=user).filter(fatdatetime__gte=start_of_month).filter(
+        fatdatetime__lt=start_of_next_month)
     context["created_fats"] = created_fats
     context["n_created_fats"] = len(created_fats)
 
-    return render_to_response('registered/fatlinkpersonalmonthlystatisticsview.html', context, context_instance=RequestContext(request))
+    return render(request, 'registered/fatlinkpersonalmonthlystatisticsview.html', context=context)
 
 
 @login_required
@@ -182,10 +186,8 @@ def click_fatlink_view(request, hash, fatname):
         # Retrieve the latest fatlink using the hash.
         try:
             fatlink = Fatlink.objects.filter(hash=hash)[0]
-            valid = True
 
-            if (timezone.now() - fatlink.fatdatetime) < datetime.timedelta(seconds=(fatlink.duration*60)):
-                active = True
+            if (timezone.now() - fatlink.fatdatetime) < datetime.timedelta(seconds=(fatlink.duration * 60)):
 
                 character = EveManager.get_character_by_id(request.META['HTTP_EVE_CHARID'])
 
@@ -210,15 +212,16 @@ def click_fatlink_view(request, hash, fatname):
                             messages.append(message[0].decode())
                         context = {'trusted': True, 'errormessages': messages}
                 else:
-                    context = {'character_id': request.META['HTTP_EVE_CHARID'], 'character_name': request.META['HTTP_EVE_CHARNAME']}
-                    return render_to_response('public/characternotexisting.html', context, context_instance=RequestContext(request))
+                    context = {'character_id': request.META['HTTP_EVE_CHARID'],
+                               'character_name': request.META['HTTP_EVE_CHARNAME']}
+                    return render(request, 'public/characternotexisting.html', context=context)
             else:
                 context = {'trusted': True, 'expired': True}
         except ObjectDoesNotExist:
             context = {'trusted': True}
     else:
         context = {'trusted': False, 'fatname': fatname}
-    return render_to_response('public/clickfatlinkview.html', context, context_instance=RequestContext(request))
+    return render(request, 'public/clickfatlinkview.html', context=context)
 
 
 @login_required
@@ -237,7 +240,7 @@ def create_fatlink_view(request):
                 fatlink.duration = form.cleaned_data["duration"]
                 fatlink.fatdatetime = timezone.now()
                 fatlink.creator = request.user
-                fatlink.hash = ''.join(random.choice(string.ascii_letters+string.digits) for i in range(10))
+                fatlink.hash = ''.join(random.choice(string.ascii_letters + string.digits) for i in range(10))
                 try:
                     fatlink.full_clean()
                     fatlink.save()
@@ -247,12 +250,12 @@ def create_fatlink_view(request):
                     for errorname, message in e.message_dict.items():
                         messages.append(message[0].decode())
                     context = {'form': form, 'errormessages': messages}
-                    return render_to_response('registered/fatlinkformatter.html', context, context_instance=RequestContext(request))
+                    return render(request, 'registered/fatlinkformatter.html', context=context)
             else:
                 form = FatlinkForm()
                 context = {'form': form, 'badrequest': True}
-                return render_to_response('registered/fatlinkformatter.html', context, context_instance=RequestContext(request))
-            return HttpResponseRedirect('/fat/')
+                return render(request, 'registered/fatlinkformatter.html', context=context)
+            return redirect('auth_fatlink_view')
 
     else:
         form = FatlinkForm()
@@ -260,7 +263,7 @@ def create_fatlink_view(request):
 
     context = {'form': form}
 
-    return render_to_response('registered/fatlinkformatter.html', context, context_instance=RequestContext(request))
+    return render(request, 'registered/fatlinkformatter.html', context=context)
 
 
 @login_required
@@ -268,25 +271,24 @@ def create_fatlink_view(request):
 def modify_fatlink_view(request, hash=""):
     logger.debug("modify_fatlink_view called by user %s" % request.user)
     if not hash:
-        return HttpResponseRedirect('/fat/')
+        return redirect('/fat/')
 
     fatlink = Fatlink.objects.filter(hash=hash)[0]
 
-    if(request.GET.get('removechar')):
+    if request.GET.get('removechar'):
         character_id = request.GET.get('removechar')
         character = EveCharacter.objects.get(character_id=character_id)
-        logger.debug("Removing character %s from fleetactivitytracking  %s" % (character.character_name ,fatlink.name))
+        logger.debug("Removing character %s from fleetactivitytracking  %s" % (character.character_name, fatlink.name))
 
         Fat.objects.filter(fatlink=fatlink).filter(character=character).delete()
 
-    if(request.GET.get('deletefat')):
+    if request.GET.get('deletefat'):
         logger.debug("Removing fleetactivitytracking  %s" % fatlink.name)
         fatlink.delete()
-        return HttpResponseRedirect('/fat/')
+        return redirect('/fat/')
 
     registered_fats = Fat.objects.filter(fatlink=fatlink).order_by('character')
 
-    context = {'fatlink':fatlink, 'registered_fats':registered_fats}
-
-    return render_to_response('registered/fatlinkmodify.html', context, context_instance=RequestContext(request))
+    context = {'fatlink': fatlink, 'registered_fats': registered_fats}
 
+    return render(request, 'registered/fatlinkmodify.html', context=context)