Minor corrections from merge.

authentication/templates/registered/base.html

@@ -157,11 +157,14 @@
                             </a>
                         </li>
 
-                        <li>
+                        {% if perms.srp.access_srp %}
-                            <a class="{% navactive request 'auth_srp_management_view auth_srp_management_all_view auth_srp_fleet_view auth_srp_fleet_add_view auth_srp_fleet_edit_view auth_srp_request_view auth_srp_request_update_amount_view' %}" href="{% url 'auth_srp_management_view' %}">
+                            <li>
-                                <i class="fa fa-money fa-fw grayiconecolor"></i>{% trans " Ship Replacement" %}
+                                <a class="{% navactive request 'auth_srp_management_view auth_srp_management_all_view auth_srp_fleet_view auth_srp_fleet_add_view auth_srp_fleet_edit_view auth_srp_request_view auth_srp_request_update_amount_view' %}" href="{% url 'auth_srp_management_view' %}">
-                            </a>
+                                    <i class="fa fa-money fa-fw grayiconecolor"></i>{% trans " Ship Replacement" %}
-                        </li>
+                                </a>
+                            </li>
+                        {% endif %}
+
                         {% menu_aux %}
 
                         {% if perms.auth.jabber_broadcast or perms.auth.jabber_broadcast_all or user.is_superuser %}

fleetactivitytracking/views.py

@@ -3,16 +3,14 @@ from django.conf import settings
 from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
 from django.contrib import messages
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-from django.db.models import Q
 from eveonline.models import EveCharacter
 from eveonline.models import EveCorporationInfo
 from eveonline.managers import EveManager
-from authentication.models import AuthServicesInfo
 from fleetactivitytracking.forms import FatlinkForm
 from fleetactivitytracking.models import Fatlink, Fat
 
@@ -60,7 +58,7 @@ class MemberStat(object):
         if mainchid:
             self.mainchid = mainchid
         else:
-            self.mainchid = request.user.profile.main_character.character_id if request.user.profile.main_character else None
+            self.mainchid = member.profile.main_character.character_id if member.profile.main_character else None
         self.mainchar = EveCharacter.objects.get(character_id=self.mainchid)
         nchars = 0
         for alliance_id in settings.STR_ALLIANCE_IDS:

optimer/migrations/0003_make_strings_more_stringy.py

@@ -8,15 +8,10 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('optimer', '0001_initial'),
+        ('optimer', '0002_auto_20170413_0442'),
     ]
 
     operations = [
-        migrations.AlterField(
-            model_name='optimer',
-            name='details',
-            field=models.CharField(default='', max_length=254),
-        ),
         migrations.AlterField(
             model_name='optimer',
             name='doctrine',
@@ -32,11 +27,6 @@ class Migration(migrations.Migration):
             name='fc',
             field=models.CharField(default='', max_length=254),
         ),
-        migrations.AlterField(
-            model_name='optimer',
-            name='location',
-            field=models.CharField(default='', max_length=254),
-        ),
         migrations.AlterField(
             model_name='optimer',
             name='operation_name',

optimer/views.py

@@ -18,10 +18,10 @@ logger = logging.getLogger(__name__)
 @permission_required('auth.optimer_view')
 def optimer_view(request):
     logger.debug("optimer_view called by user %s" % request.user)
-    render_items = {'optimer': optimer.objects.all(),
+    render_items = {'optimer': OpTimer.objects.all(),
-                    'future_timers': optimer.objects.all().filter(
+                    'future_timers': OpTimer.objects.all().filter(
                         start__gte=timezone.now()),
-                    'past_timers': optimer.objects.all().filter(
+                    'past_timers': OpTimer.objects.all().filter(
                         start__lt=timezone.now()).order_by('-start')}
 
     return render(request, 'registered/operationmanagement.html', context=render_items)

srp/views.py

@@ -272,11 +272,11 @@ def srp_request_approve(request):
             logger.info("Approved SRP request id %s for character %s by user %s" % (
                 srp_request_id, srpuserrequest.character, request.user))
             notify(
-                srpuserrequest.character.user,
+                srpuserrequest.character.character_ownership.user,
                 'SRP Request Approved',
                 level='success',
                 message='Your SRP request for a %s lost during %s has been approved for %s ISK.' % (
-                    srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name, srpuserrequest.srp_total_amount)
+                    srpuserrequest.srp_ship_name, srpuserrequest.srp_fleet_main.fleet_name, intcomma(srpuserrequest.srp_total_amount))
             )
     if stored_fleet_view is None:
         logger.error("Unable to approve srp request id %s on behalf of user %s - request matching id not found." % (
@@ -308,7 +308,7 @@ def srp_request_reject(request):
             logger.info("SRP request id %s for character %s rejected by %s" % (
                 srp_request_id, srpuserrequest.character, request.user))
             notify(
-                srpuserrequest.character.user,
+                srpuserrequest.character.character_ownership.user,
                 'SRP Request Rejected',
                 level='danger',
                 message='Your SRP request for a %s lost during %s has been rejected.' % (