diff --git a/alliance_auth/tests/auth_utils.py b/alliance_auth/tests/auth_utils.py index 7b5ca99e..fec0b4be 100644 --- a/alliance_auth/tests/auth_utils.py +++ b/alliance_auth/tests/auth_utils.py @@ -3,9 +3,8 @@ from __future__ import unicode_literals from django.db.models.signals import m2m_changed, pre_save from django.contrib.auth.models import User, Group from services.signals import m2m_changed_user_groups, pre_save_user -from services.signals import m2m_changed_group_permissions, m2m_changed_user_permissions -from authentication.signals import pre_save_auth_state -from authentication.models import UserProfile +from services.signals import m2m_changed_group_permissions, m2m_changed_user_permissions, m2m_changed_state_permissions +from authentication.models import UserProfile, State from eveonline.models import EveCharacter @@ -23,47 +22,33 @@ class AuthUtils: if disconnect_signals: cls.disconnect_signals() user = cls._create_user(username) - user.authservicesinfo.state = NONE_STATE - user.authservicesinfo.save() if disconnect_signals: cls.connect_signals() return user @classmethod def create_member(cls, username): - cls.disconnect_signals() - user = cls._create_user(username) - user.authservicesinfo.state = MEMBER_STATE - user.authservicesinfo.save() - make_member(user.authservicesinfo) - cls.connect_signals() - return user + return cls.create_user(username, disconnect_signals=True) @classmethod def create_blue(cls, username): - cls.disconnect_signals() - user = cls._create_user(username) - user.authservicesinfo.state = BLUE_STATE - user.authservicesinfo.save() - make_blue(user.authservicesinfo) - cls.connect_signals() - return user + return cls.create_user(username, disconnect_signals=True) @classmethod def disconnect_signals(cls): m2m_changed.disconnect(m2m_changed_user_groups, sender=User.groups.through) m2m_changed.disconnect(m2m_changed_group_permissions, sender=Group.permissions.through) m2m_changed.disconnect(m2m_changed_user_permissions, sender=User.user_permissions.through) + m2m_changed.disconnect(m2m_changed_state_permissions, sender=State.permissions.through) pre_save.disconnect(pre_save_user, sender=User) - pre_save.disconnect(pre_save_auth_state, sender=AuthServicesInfo) @classmethod def connect_signals(cls): m2m_changed.connect(m2m_changed_user_groups, sender=User.groups.through) m2m_changed.connect(m2m_changed_group_permissions, sender=Group.permissions.through) m2m_changed.connect(m2m_changed_user_permissions, sender=User.user_permissions.through) + m2m_changed.connect(m2m_changed_state_permissions, sender=State.permissions.through) pre_save.connect(pre_save_user, sender=User) - pre_save.connect(pre_save_auth_state, sender=AuthServicesInfo) @classmethod def add_main_character(cls, user, name, character_id, corp_id='', corp_name='', corp_ticker='', alliance_id='', diff --git a/corputils/models.py b/corputils/models.py index c084f841..cbf62f22 100644 --- a/corputils/models.py +++ b/corputils/models.py @@ -66,6 +66,9 @@ class CorpStats(models.Model): # purge old members self.members.exclude(character_id__in=member_ids).delete() + # update the timer + self.save() + except TokenError as e: logger.warning("%s failed to update: %s" % (self, e)) if self.token.user: diff --git a/corputils/templates/corputils/corpstats.html b/corputils/templates/corputils/corpstats.html index ceebadea..312b22dc 100644 --- a/corputils/templates/corputils/corpstats.html +++ b/corputils/templates/corputils/corpstats.html @@ -58,104 +58,108 @@
-
{% bootstrap_paginate mains range=10 %}
-
- - - - - - {% for main in mains %} - - + + {% endfor %} +
{% trans "Main" %}{% trans "Characters" %}
-
- -
- {{ main }} + {% if mains %} +
{% bootstrap_paginate mains range=10 %}
+
+ + {% for main in mains %} + + -
+
+ +
+ {{ main }} +
- - 		- - {% for alt in main.alts %} - {% if forloop.first %} + + - - {% endfor %} -
+ + {% for alt in main.alts %} + {% if forloop.first %} + + + + + + + {% endif %} - - - - + + + + - {% endif %} - - - - - - - {% endfor %} -
{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}
{% trans "Character" %}{% trans "zKillboard" %}{% trans "Corporation" %}{% trans "Alliance" %}{{ alt.character_name }}{{ alt.corporation_name }}{{ alt.alliance_name }} + + {% trans "Killboard" %} + +
{{ alt.character_name }}{% trans "Killboard" %}{{ alt.corporation_name }}{{ alt.alliance_name }}
-
- + {% endfor %} +
+
+
+ {% endif %}
-
{% bootstrap_paginate members range=10 %}
-
- - - - - - - - - - {% for member in members %} - - - - - - - + {% if members %} +
{% bootstrap_paginate members range=10 %}
+
+
{% trans "Character" %}{% trans "zKillboard" %}{% trans "Main Character" %}{% trans "Main Corporation" %}{% trans "Main Alliance" %}
{{ member.character_name }}{% trans "Killboard" %}{{ member.main_character.character_name }}{{ member.main_character.corporation_name }}{{ member.main_character.alliance_name }}
+ + + + + + + - {% endfor %} -
{% trans "Character" %}{% trans "Main Character" %}{% trans "Main Corporation" %}{% trans "Main Alliance" %}
-
+ {% for member in members %} + + + {{ member.character_name }} + {% trans "Killboard" %} + {{ member.main_character.character_name }} + {{ member.main_character.corporation_name }} + {{ member.main_character.alliance_name }} + + {% endfor %} + +
+ {% endif %}
-
{% bootstrap_paginate unregistered range=10 %}
-
- - - - - - - {% for member in unregistered %} - - - - + {% if unregistered %} +
{% bootstrap_paginate unregistered range=10 %}
+
+
{% trans "Character" %}{% trans "zKillboard" %}
{{ member.character_name }} - - {% trans "Killboard" %} - -
+ + + + - {% endfor %} -
{% trans "Character" %}
-
+ {% for member in unregistered %} + + + {{ member.character_name }} + + + {% trans "Killboard" %} + + + + {% endfor %} + +
+ {% endif %}
diff --git a/services/modules/teamspeak3/manager.py b/services/modules/teamspeak3/manager.py index 1aa35d5f..c6e99810 100755 --- a/services/modules/teamspeak3/manager.py +++ b/services/modules/teamspeak3/manager.py @@ -184,10 +184,10 @@ class Teamspeak3Manager: logger.debug("Adding user to TS3 server with cleaned username %s" % username_clean) server_groups = Teamspeak3Manager._group_list() - if settings.DEFAULT_AUTH_GROUP not in server_groups: - Teamspeak3Manager._create_group(settings.DEFAULT_AUTH_GROUP) + if 'Member' not in server_groups: + Teamspeak3Manager._create_group('Member') - alliance_group_id = Teamspeak3Manager._group_id_by_name(settings.DEFAULT_AUTH_GROUP) + alliance_group_id = Teamspeak3Manager._group_id_by_name('Member') try: ret = server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': alliance_group_id, 'tokenid2': 0,