Removed redundant function from tasks.py

Added Corp/Alliance name switching to base template.
Fixed logic error in corp application filtering for hrapplication views.

celerytask/tasks.py

@@ -23,9 +23,6 @@ from eveonline.models import EveCharacter
 from eveonline.models import EveCorporationInfo
 from authentication.managers import AuthServicesInfoManager
 
-def generate_corp_group_name(corpname):
-    return 'Corp_' + corpname.replace(' ', '_')
-
 def disable_alliance_member(user, char_id):
     remove_member_permission(user, 'member')
     remove_user_from_group(user, settings.DEFAULT_AUTH_GROUP)

hrapplications/views.py

@@ -29,10 +29,11 @@ def hr_application_management_view(request):
 		auth_info = AuthServicesInfo.objects.get(user=request.user)
 		if auth_info.main_char_id != "":
 			main_corp_id = EveManager.get_charater_corporation_id_by_id(auth_info.main_char_id)
-			if main_corp_id == settings.CORP_ID:
+                        main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_id)
+			if (settings.IS_CORP and main_corp_id == settings.CORP_ID) or (not settings.IS_CORP and main_alliance_id == settings.ALLIANCE_ID):
 				main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id)
 				corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
-				corp_applications = HRApplication.objects.filter(approved_denied=None)
+				corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
 			else:
 				corp_applications = None
 

templates/public/base.html

@@ -36,7 +36,11 @@
             <div class="navbar-header ">
                 <a class="navbar-brand ">
                     <div class="fa fa-cog fa-spin"></div>
-                    {{ CORP_NAME }}
+                    {% if IS_CORP %}
+                        <title>{{ CORP_NAME }}</title>
+                    {% else %}
+                        <title>{{ ALLIANCE_NAME }}</title>
+                    {% endif %}
                 </a>
             </div>