From cb3dd1f393ee3282fc928b6c16f14b5dbac539a3 Mon Sep 17 00:00:00 2001
From: moriartyj <moriartyj@gmail.com>
Date: Sun, 26 Jun 2016 07:18:48 -0700
Subject: [PATCH] Mumble uses alliance ticker for BLUES (#479)

* Mumble uses alliance ticker for BLUES

* Move alliance ticker section for blues

* Fixed Reviewer translated link
---
 services/views.py                                     | 11 +++++++++--
 .../templates/registered/hrapplicationmanagement.html |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/services/views.py b/services/views.py
index a1d74688..25dcfa97 100755
--- a/services/views.py
+++ b/services/views.py
@@ -7,6 +7,7 @@ from django.contrib.auth.decorators import user_passes_test
 from django.contrib.auth.models import Group
 
 from eveonline.models import EveCharacter
+from eveonline.models import EveAllianceInfo
 from authentication.models import AuthServicesInfo
 from managers.openfire_manager import OpenfireManager
 from managers.phpbb3_manager import Phpbb3Manager
@@ -358,12 +359,18 @@ def activate_mumble(request):
     logger.debug("activate_mumble called by user %s" % request.user)
     authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
     character = EveManager.get_character_by_id(authinfo.main_char_id)
+    ticker = character.corporation_ticker
+
     if check_if_user_has_permission(request.user, "blue_member"):
         logger.debug("Adding mumble user for blue user %s with main character %s" % (request.user, character))
-        result = MumbleManager.create_blue_user(character.corporation_ticker, character.character_name)
+        # Blue members should have alliance ticker (if in alliance)
+        if EveAllianceInfo.objects.filter(alliance_id=character.alliance_id).exists():
+            alliance = EveAllianceInfo.objects.filter(alliance_id=character.alliance_id)[0]
+            ticker = alliance.alliance_ticker
+        result = MumbleManager.create_blue_user(ticker, character.character_name)
     else:
         logger.debug("Adding mumble user for user %s with main character %s" % (request.user, character))
-        result = MumbleManager.create_user(character.corporation_ticker, character.character_name)
+        result = MumbleManager.create_user(ticker, character.character_name)
     # if its empty we failed
     if result[0] is not "":
         AuthServicesInfoManager.update_user_mumble_info(result[0], result[1], request.user)
diff --git a/stock/templates/registered/hrapplicationmanagement.html b/stock/templates/registered/hrapplicationmanagement.html
index fec581e8..ff3e856b 100755
--- a/stock/templates/registered/hrapplicationmanagement.html
+++ b/stock/templates/registered/hrapplicationmanagement.html
@@ -132,7 +132,7 @@
                                     <td class="text-center">
                                         {% if app.approved_denied == None %}
                                             {% if app.reviewer_str %}
-                                                <div class="label label-info">{% trans "Reviewer: {{ app.reviewer_str }}</div>
+                                                <div class="label label-info">{% trans "Reviewer:" %} {{ app.reviewer_str }}</div>
                                             {% else %}
                                                 <div class="label label-warning">{% trans "Pending" %}</div>
                                             {% endif %}