Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-14 15:00:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from R4stl1n/master

Browse Source 
update
This commit is contained in:
Mr McClain 2016-03-08 18:35:01 -06:00
commit 727a242728
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
celerytask/tasks.py
View File

@ -67,7 +67,7 @@ def update_jabber_groups(user):
logger.debug("Updating user %s jabber groups to %s" % (user, groups)) logger.debug("Updating user %s jabber groups to %s" % (user, groups))
OpenfireManager.update_user_groups(authserviceinfo.jabber_username, authserviceinfo.jabber_password, groups) OpenfireManager.update_user_groups(authserviceinfo.jabber_username, authserviceinfo.jabber_password, groups)
logger.info("Updated user %s jabber groups." % user) logger.debug("Updated user %s jabber groups." % user)
def update_mumble_groups(user): def update_mumble_groups(user):
@ -83,7 +83,7 @@ def update_mumble_groups(user):
groups.append('empty') groups.append('empty')
logger.debug("Updating user %s mumble groups to %s" % (user, groups)) logger.debug("Updating user %s mumble groups to %s" % (user, groups))
MumbleManager.update_groups(authserviceinfo.mumble_username, groups) MumbleManager.update_groups(authserviceinfo.mumble_username, groups)
logger.info("Updated user %s mumble groups." % user) logger.debug("Updated user %s mumble groups." % user)
def update_forum_groups(user): def update_forum_groups(user):
logger.debug("Updating forum groups for user %s" % user) logger.debug("Updating forum groups for user %s" % user)
@ -98,7 +98,7 @@ def update_forum_groups(user):
groups.append('empty') groups.append('empty')
logger.debug("Updating user %s forum groups to %s" % (user, groups)) logger.debug("Updating user %s forum groups to %s" % (user, groups))
Phpbb3Manager.update_groups(authserviceinfo.forum_username, groups) Phpbb3Manager.update_groups(authserviceinfo.forum_username, groups)
logger.info("Updated user %s forum groups." % user) logger.debug("Updated user %s forum groups." % user)
def update_ipboard_groups(user): def update_ipboard_groups(user):
logger.debug("Updating user %s ipboard groups." % user) logger.debug("Updating user %s ipboard groups." % user)
@ -113,7 +113,7 @@ def update_ipboard_groups(user):
groups.append('empty') groups.append('empty')
logger.debug("Updating user %s ipboard groups to %s" % (user, groups)) logger.debug("Updating user %s ipboard groups to %s" % (user, groups))
IPBoardManager.update_groups(authserviceinfo.ipboard_username, groups) IPBoardManager.update_groups(authserviceinfo.ipboard_username, groups)
logger.info("Updated user %s ipboard groups." % user) logger.debug("Updated user %s ipboard groups." % user)
def update_teamspeak3_groups(user): def update_teamspeak3_groups(user):
logger.debug("Updating user %s teamspeak3 groups" % user) logger.debug("Updating user %s teamspeak3 groups" % user)
@ -128,7 +128,7 @@ def update_teamspeak3_groups(user):
groups[ts_group.ts_group_name] = ts_group.ts_group_id groups[ts_group.ts_group_name] = ts_group.ts_group_id
logger.debug("Updating user %s teamspeak3 groups to %s" % (user, groups)) logger.debug("Updating user %s teamspeak3 groups to %s" % (user, groups))
Teamspeak3Manager.update_groups(authserviceinfo.teamspeak3_uid, groups) Teamspeak3Manager.update_groups(authserviceinfo.teamspeak3_uid, groups)
logger.info("Updated user %s teamspeak3 groups." % user) logger.debug("Updated user %s teamspeak3 groups." % user)
def update_discord_groups(user): def update_discord_groups(user):
logger.debug("Updating discord groups for user %s" % user) logger.debug("Updating discord groups for user %s" % user)
@ -144,7 +144,7 @@ def update_discord_groups(user):
groups.append('empty') groups.append('empty')
logger.debug("Updating user %s discord groups to %s" % (user, groups)) logger.debug("Updating user %s discord groups to %s" % (user, groups))
DiscordManager.update_groups(authserviceinfo.discord_uid, groups) DiscordManager.update_groups(authserviceinfo.discord_uid, groups)
logger.info("Updated user %s discord groups." % user) logger.debug("Updated user %s discord groups." % user)
def create_syncgroup_for_user(user, groupname, servicename): def create_syncgroup_for_user(user, groupname, servicename):
logger.debug("Creating syncgroupcache for user %s group %s in service %s" % (user, groupname, servicename)) logger.debug("Creating syncgroupcache for user %s group %s in service %s" % (user, groupname, servicename))
@ -561,7 +561,7 @@ def run_api_refresh():
set_state(user) set_state(user)
def populate_alliance(id, blue=False): def populate_alliance(id, blue=False):
logger.info("Populating alliance model with id %s blue %s" % (id, blue)) logger.debug("Populating alliance model with id %s blue %s" % (id, blue))
alliance_info = EveApiManager.get_alliance_information(id) alliance_info = EveApiManager.get_alliance_information(id)
if not alliance_info: if not alliance_info:

4
eveonline/managers.py
View File

@ -106,7 +106,7 @@ class EveManager:
alliance_info.member_count = alliance_member_count alliance_info.member_count = alliance_member_count
alliance_info.is_blue = is_blue alliance_info.is_blue = is_blue
alliance_info.save() alliance_info.save()
logger.info("Updated alliance model %s" % alliance_info) logger.debug("Updated alliance model %s" % alliance_info)
else: else:
logger.warn("Attempting to update non-existing alliance model with id %s" % alliance_id) logger.warn("Attempting to update non-existing alliance model with id %s" % alliance_id)
@ -136,7 +136,7 @@ class EveManager:
corp_info.alliance = alliance corp_info.alliance = alliance
corp_info.is_blue = is_blue corp_info.is_blue = is_blue
corp_info.save() corp_info.save()
logger.info("Updated corp model %s" % corp_info) logger.debug("Updated corp model %s" % corp_info)
else: else:
logger.warn("Attempting to update non-existant corp model with id %s" % corp_id) logger.warn("Attempting to update non-existant corp model with id %s" % corp_id)

2
groupmanagement/views.py
View File

@ -120,6 +120,8 @@ def groups_view(request):
# Check if group is a corp # Check if group is a corp
if "Corp_" in group.name: if "Corp_" in group.name:
pass pass
elif "Alliance_" in group.name:
pass
elif settings.DEFAULT_AUTH_GROUP in group.name: elif settings.DEFAULT_AUTH_GROUP in group.name:
pass pass
elif settings.DEFAULT_BLUE_GROUP in group.name: elif settings.DEFAULT_BLUE_GROUP in group.name:

1
stock/templates/registered/signaturemanagement.html
View File

@ -46,7 +46,6 @@
<td style="width:150px" class="text-center">{{ sigt.lifetime_status }}</td> <td style="width:150px" class="text-center">{{ sigt.lifetime_status }}</td>
<td style="width:150px" class="text-center">{{ sigt.mass_status }}</td> <td style="width:150px" class="text-center">{{ sigt.mass_status }}</td>
<td style="width:150px" class="text-center">{{ sigt.ships_size }}</td> <td style="width:150px" class="text-center">{{ sigt.ships_size }}</td>
<td style="width:150px" class="text-center">{{ sigt.status }}</td>
<td style="width:150px" class="text-center">{{ sigt.notes }}</td> <td style="width:150px" class="text-center">{{ sigt.notes }}</td>
<td style="width:150px" class="text-center">{{ sigt.post_time}}</td> <td style="width:150px" class="text-center">{{ sigt.post_time}}</td>
{% if perms.auth.signature_management %} {% if perms.auth.signature_management %}