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.

optimer/__init__.py

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

optimer/admin.py

@@ -1,6 +1,6 @@
+from __future__ import unicode_literals
 from django.contrib import admin
 
-from models import optimer
+from optimer.models import optimer
 
 admin.site.register(optimer)
-# Register your models here.

optimer/apps.py

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

optimer/form.py

@@ -1,11 +1,9 @@
+from __future__ import unicode_literals
 from django import forms
-from django.core.validators import MaxValueValidator, MinValueValidator
 from django.utils.translation import ugettext_lazy as _
 
 
-
 class opForm(forms.Form):
-    
     doctrine = forms.CharField(max_length=254, required=True, label=_('Doctrine'))
     system = forms.CharField(max_length=254, required=True, label=_("System"))
     location = forms.CharField(max_length=254, required=True, label=_("Location"))

optimer/migrations/0001_initial.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-05 21:40
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('eveonline', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='optimer',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('doctrine', models.CharField(default=b'', max_length=254)),
+                ('system', models.CharField(default=b'', max_length=254)),
+                ('location', models.CharField(default=b'', max_length=254)),
+                ('start', models.DateTimeField(default=datetime.datetime.now)),
+                ('duration', models.CharField(default=b'', max_length=25)),
+                ('operation_name', models.CharField(default=b'', max_length=254)),
+                ('fc', models.CharField(default=b'', max_length=254)),
+                ('details', models.CharField(default=b'', max_length=254)),
+                ('post_time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('eve_character', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eveonline.EveCharacter')),
+            ],
+            options={
+                'ordering': ['start'],
+            },
+        ),
+    ]

optimer/models.py

@@ -1,14 +1,16 @@
+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 django.utils import timezone
 from eveonline.models import EveCharacter
-from eveonline.models import EveCorporationInfo
 from datetime import datetime
 
 
+@python_2_unicode_compatible
 class optimer(models.Model):
     class Meta:
         ordering = ['start']
+
     doctrine = models.CharField(max_length=254, default="")
     system = models.CharField(max_length=254, default="")
     location = models.CharField(max_length=254, default="")
@@ -23,4 +25,3 @@ class optimer(models.Model):
     def __str__(self):
         output = self.operation_name
         return output.encode('utf-8')
-

optimer/views.py

@@ -1,38 +1,29 @@
-
-
-from django.http import HttpResponseRedirect
-from django.template import RequestContext
-from django.shortcuts import render_to_response
+from __future__ import unicode_literals
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.decorators import user_passes_test
 from django.utils import timezone
 from django.shortcuts import get_object_or_404
-
-from util import check_if_user_has_permission
-from authentication.managers import AuthServicesInfoManager
+from django.shortcuts import render, redirect
+from django.contrib import messages
+from authentication.models import AuthServicesInfo
 from eveonline.managers import EveManager
-from form import opForm
-from models import optimer
-
+from optimer.form import opForm
+from optimer.models import optimer
+from authentication.decorators import members_and_blues
 
 import logging
 
 logger = logging.getLogger(__name__)
 
-def optimer_util_test(user):
-    return check_if_user_has_permission(user, 'member') or check_if_user_has_permission(user, 'blue_member')
-
 
 @login_required
-@user_passes_test(optimer_util_test)
+@members_and_blues()
 @permission_required('auth.optimer_view')
 def optimer_view(request):
     logger.debug("optimer_view called by user %s" % request.user)
-    optimer_list = optimer.objects.all()
-    render_items = {'optimer': optimer.objects.all(),}
+    render_items = {'optimer': optimer.objects.all(), }
 
-    return render_to_response('registered/operationmanagement.html', render_items, context_instance=RequestContext(request))
+    return render(request, 'registered/operationmanagement.html', context=render_items)
 
 
 @login_required
@@ -40,13 +31,13 @@ def optimer_view(request):
 def add_optimer_view(request):
     logger.debug("add_optimer_view called by user %s" % request.user)
     if request.method == 'POST':
-    	form = opForm(request.POST)
-    	logger.debug("Request type POST contains form valid: %s" % form.is_valid())
+        form = opForm(request.POST)
+        logger.debug("Request type POST contains form valid: %s" % form.is_valid())
         if form.is_valid():
-            #Get Current Time
+            # Get Current Time
             post_time = timezone.now()
             # Get character
-            auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
+            auth_info = AuthServicesInfo.objects.get_or_create(user=request.user)[0]
             character = EveManager.get_character_by_id(auth_info.main_char_id)
             # handle valid form
             op = optimer()
@@ -62,14 +53,15 @@ def add_optimer_view(request):
             op.eve_character = character
             op.save()
             logger.info("User %s created op timer with name %s" % (request.user, op.operation_name))
-            return HttpResponseRedirect("/optimer/")
+            messages.success(request, 'Created operation timer for %s.' % op.operation_name)
+            return redirect("/optimer/")
     else:
         logger.debug("Returning new opForm")
         form = opForm()
 
     render_items = {'form': form}
 
-    return render_to_response('registered/addoperation.html', render_items, context_instance=RequestContext(request))
+    return render(request, 'registered/addoperation.html', context=render_items)
 
 
 @login_required
@@ -80,9 +72,12 @@ def remove_optimer(request, optimer_id):
         op = optimer.objects.get(id=optimer_id)
         op.delete()
         logger.info("Deleting optimer id %s by user %s" % (optimer_id, request.user))
+        messages.success(request, 'Removed operation timer for %s.' % op.operation_name)
     else:
-        logger.error("Unable to delete optimer id %s for user %s - operation matching id not found." % (optimer_id, request.user))
-    return HttpResponseRedirect("/optimer/")
+        logger.error("Unable to delete optimer id %s for user %s - operation matching id not found." % (
+            optimer_id, request.user))
+    return redirect("auth_optimer_view")
+
 
 @login_required
 @permission_required('auth.optimer_management')
@@ -93,7 +88,7 @@ def edit_optimer(request, optimer_id):
         form = opForm(request.POST)
         logger.debug("Received POST request containing update optimer form, is valid: %s" % form.is_valid())
         if form.is_valid():
-            auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
+            auth_info = AuthServicesInfo.objects.get_or_create(user=request.user)[0]
             character = EveManager.get_character_by_id(auth_info.main_char_id)
             op.doctrine = form.cleaned_data['doctrine']
             op.system = form.cleaned_data['system']
@@ -106,9 +101,8 @@ def edit_optimer(request, optimer_id):
             op.eve_character = character
             logger.info("User %s updating optimer id %s " % (request.user, optimer_id))
             op.save()
-
-        logger.debug("Detected no changes between optimer id %s and supplied form." % optimer_id)
-        return HttpResponseRedirect("/optimer/")
+            messages.success(request, 'Saved changes to operation timer for %s.' % op.operation_name)
+            return redirect("auth_optimer_view")
     else:
         data = {
             'doctrine': op.doctrine,
@@ -120,5 +114,5 @@ def edit_optimer(request, optimer_id):
             'fc': op.fc,
             'details': op.details,
         }
-        form = opForm(initial= data)
-    return render_to_response('registered/optimerupdate.html', {'form':form}, context_instance=RequestContext(request))
+        form = opForm(initial=data)
+    return render(request, 'registered/optimerupdate.html', context={'form': form})