Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-13 10:36:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve Dj20 compatibility issues

Browse Source 
Temporarily use latest snapshot for esi for dj20

    Correct admin urls include

    Manually correct old ts3 table migration

    Remove obsolete services migrations

    Remove bootstrap pagination package

    Fix url namespacing
This commit is contained in:
Basraah
2017-09-28 14:47:06 +10:00
parent 51e4db73f0
commit 8864afd784
28 changed files with 50 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
allianceauth/fleetactivitytracking/views.py
View File

@@ -29,19 +29,6 @@ SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sw
logger = logging.getLogger(__name__)
FATS_PER_PAGE = int(getattr(settings, 'FATS_PER_PAGE', 20))
def get_page(model_list, page_num):
p = Paginator(model_list, FATS_PER_PAGE)
try:
fats = p.page(page_num)
except PageNotAnInteger:
fats = p.page(1)
except EmptyPage:
fats = p.page(p.num_pages)
return fats
class CorpStat(object):
def __init__(self, corp_id, start_of_month, start_of_next_month, corp=None):
@@ -359,8 +346,6 @@ def modify_fatlink_view(request, hash=""):
registered_fats = Fat.objects.filter(fatlink=fatlink).order_by('character__character_name')
fat_page = get_page(registered_fats, request.GET.get('page', 1))
context = {'fatlink': fatlink, 'registered_fats': fat_page}
context = {'fatlink': fatlink, 'registered_fats': registered_fats}
return render(request, 'fleetactivitytracking/fatlinkmodify.html', context=context)