mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-15 07:20:17 +02:00
Correct display of non-default CorpStats
Correct display of application comments Beautify notifications panel
This commit is contained in:
Adarnof
parent
04053c8465
commit
3063355eb7
@ -8,6 +8,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.conf import settings
|
||||
from eveonline.models import EveCharacter, EveCorporationInfo
|
||||
from eveonline.managers import EveManager
|
||||
from corputils.models import CorpStats
|
||||
from esi.decorators import token_required
|
||||
from bravado.exception import HTTPError
|
||||
@ -41,9 +42,12 @@ def corpstats_add(request, token):
|
||||
corp_id = EveCharacter.objects.get(character_id=token.character_id).corporation_id
|
||||
else:
|
||||
corp_id = \
|
||||
token.get_esi_client(Character='v4').Character.get_characters_character_id(character_id=token.character_id).result()[
|
||||
'corporation_id']
|
||||
token.get_esi_client(Character='v4').Character.get_characters_character_id(
|
||||
character_id=token.character_id).result()['corporation_id']
|
||||
try:
|
||||
corp = EveCorporationInfo.objects.get(corporation_id=corp_id)
|
||||
except EveCorporationInfo.DoesNotExist:
|
||||
corp = EveManager.create_corporation(corp_id)
|
||||
cs = CorpStats.objects.create(token=token, corp=corp)
|
||||
try:
|
||||
cs.update()
|
||||
@ -52,8 +56,6 @@ def corpstats_add(request, token):
|
||||
assert cs.pk # ensure update was successful
|
||||
if CorpStats.objects.filter(pk=cs.pk).visible_to(request.user).exists():
|
||||
return redirect('corputils:view_corp', corp_id=corp.corporation_id)
|
||||
except EveCorporationInfo.DoesNotExist:
|
||||
messages.error(request, _('Unrecognized corporation. Please ensure it is a member of the alliance or a blue.'))
|
||||
except IntegrityError:
|
||||
messages.error(request, _('Selected corp already has a statistics module.'))
|
||||
except AssertionError:
|
||||
@ -81,7 +83,7 @@ def corpstats_view(request, corp_id=None):
|
||||
# get default model if none requested
|
||||
if not corp_id and available.count() == 1:
|
||||
corpstats = available[0]
|
||||
elif available.count() > 1 and request.user.profile.main_character:
|
||||
elif not corp_id and available.count() > 1 and request.user.profile.main_character:
|
||||
# get their main corp if available
|
||||
try:
|
||||
corpstats = available.get(corp__corporation_id=request.user.profile.main_character.corporation_id)
|
||||
@ -134,7 +136,8 @@ def corpstats_search(request):
|
||||
results = []
|
||||
search_string = request.GET.get('search_string', None)
|
||||
if search_string:
|
||||
has_similar = CorpStats.objects.filter(members__character_name__icontains=search_string).visible_to(request.user).distinct()
|
||||
has_similar = CorpStats.objects.filter(members__character_name__icontains=search_string).visible_to(
|
||||
request.user).distinct()
|
||||
for corpstats in has_similar:
|
||||
similar = corpstats.members.filter(character_name__icontains=search_string)
|
||||
for s in similar:
|
||||
|
||||
@ -109,7 +109,7 @@
|
||||
<a class="collapsed" data-toggle="collapse" data-parent="#accordion"
|
||||
href="#collapseThree" aria-expanded="false"
|
||||
aria-controls="collapseThree">
|
||||
{% blocktrans %}Comments - {{ comments|length }}{% endblocktrans %}
|
||||
{% trans 'Comments' %} ({{ comments.count }})
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
@ -119,7 +119,11 @@
|
||||
{% for comment in comments %}
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading" role="tab" id="">
|
||||
<div class="panel-title">{{ comment.created }} - {{ comment.user }}</div>
|
||||
<div class="panel-title">
|
||||
<div class="pull-right">{{ comment.created }}</div>
|
||||
<div class="pull-left">{% if comment.user.profile.main_character %}{{ comment.user.profile.main_character }}{% else %}{{ comment.user }}{% endif %}</div>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body">{{ comment.text|linebreaks }}</div>
|
||||
</div>
|
||||
|
||||
@ -10,17 +10,24 @@
|
||||
<div class="col-lg-12 container" id="example">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="active"><a data-toggle="tab" href="#unread">{% trans "Unread" %} <b>({{unread|length}})</b></a></li>
|
||||
<li><a data-toggle="tab" href="#read">{% trans "Read" %} <b>({{read|length}})</b></a></li>
|
||||
<div class="text-right">
|
||||
<a href="{% url 'auth_mark_all_notifications_read' %}" class="btn btn-primary">{% trans "Mark All Read" %}</a>
|
||||
<a href="{% url 'auth_delete_all_read_notifications' %}" class="btn btn-danger">{% trans "Delete All Read" %}</a>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<ul class="nav nav-pills">
|
||||
<li class="active"><a data-toggle="pill" href="#unread">{% trans "Unread" %}
|
||||
<b>({{ unread|length }})</b></a></li>
|
||||
<li><a data-toggle="pill" href="#read">{% trans "Read" %} <b>({{ read|length }})</b></a>
|
||||
</li>
|
||||
<div class="pull-right">
|
||||
<a href="{% url 'auth_mark_all_notifications_read' %}"
|
||||
class="btn btn-primary">{% trans "Mark All Read" %}</a>
|
||||
<a href="{% url 'auth_delete_all_read_notifications' %}"
|
||||
class="btn btn-danger">{% trans "Delete All Read" %}</a>
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="tab-content">
|
||||
<div id="unread" class="tab-pane fade in active">
|
||||
<div class="panel-body">
|
||||
<div class="table-responsive">
|
||||
{% if unread %}
|
||||
<table class="table table-condensed table-hover table-striped">
|
||||
@ -34,10 +41,12 @@
|
||||
<td class="text-center">{{ notif.timestamp }}</td>
|
||||
<td class="text-center">{{ notif.title }}</td>
|
||||
<td class="text-center">
|
||||
<a href="{% url 'auth_notification_view' notif.id %}" class="btn btn-success" title="View">
|
||||
<a href="{% url 'auth_notification_view' notif.id %}"
|
||||
class="btn btn-success" title="View">
|
||||
<span class="glyphicon glyphicon-eye-open"></span>
|
||||
</a>
|
||||
<a href="{% url 'auth_remove_notification' notif.id %}" class="btn btn-danger" title="Remove">
|
||||
<a href="{% url 'auth_remove_notification' notif.id %}"
|
||||
class="btn btn-danger" title="Remove">
|
||||
<span class="glyphicon glyphicon-remove"></span>
|
||||
</a>
|
||||
</td>
|
||||
@ -49,7 +58,6 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="read" class="tab-pane fade">
|
||||
<div class="panel-body">
|
||||
<div class="table-responsive">
|
||||
@ -65,10 +73,12 @@
|
||||
<td class="text-center">{{ notif.timestamp }}</td>
|
||||
<td class="text-center">{{ notif.title }}</td>
|
||||
<td class="text-center">
|
||||
<a href="{% url 'auth_notification_view' notif.id %}" class="btn btn-success" title="View">
|
||||
<a href="{% url 'auth_notification_view' notif.id %}"
|
||||
class="btn btn-success" title="View">
|
||||
<span class="glyphicon glyphicon-eye-open"></span>
|
||||
</a>
|
||||
<a href="{% url 'auth_remove_notification' notif.id %}" class="btn btn-danger" title="remove">
|
||||
<a href="{% url 'auth_remove_notification' notif.id %}"
|
||||
class="btn btn-danger" title="remove">
|
||||
<span class="glyphicon glyphicon-remove"></span>
|
||||
</a>
|
||||
</td>
|
||||
@ -86,4 +96,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user