Merge pull request GW2Raidar#361 from MartinGalu/359-django-breaking-…

…code-updates 359 Django Breaking Code Updates
Nightara · May 19, 2021 · 5c08045 · 5c08045
2 parents e0cff1a + f18e2af
commit 5c08045
Show file tree

Hide file tree

Showing 20 changed files with 18 additions and 18 deletions.
diff --git a/raidar/api_v2/views.py b/raidar/api_v2/views.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers, viewsets, generics
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from rest_framework.schemas.inspectors import AutoSchema
+from rest_framework.schemas import AutoSchema
 from rest_framework.pagination import LimitOffsetPagination
 from rest_framework.parsers import FileUploadParser, MultiPartParser
 import coreapi

diff --git a/raidar/static/raidar/img/buff/Aegis.png b/raidar/static/raidar/img/buff/Aegis.png
diff --git a/raidar/static/raidar/img/buff/vigor.png b/raidar/static/raidar/img/buff/vigor.png
diff --git a/raidar/templates/raidar/encounter.html b/raidar/templates/raidar/encounter.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="uk-grid uk-margin-large-bottom uk-margin-small-top">
   [[#with encounter]]
 

diff --git a/raidar/templates/raidar/encounter_boon_output.html b/raidar/templates/raidar/encounter_boon_output.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="table-container">
   {% include 'raidar/encounter_row_header.html' %}
 

diff --git a/raidar/templates/raidar/encounter_boon_uptime.html b/raidar/templates/raidar/encounter_boon_uptime.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="table-container">
   {% include 'raidar/encounter_row_header.html' %}
 

diff --git a/raidar/templates/raidar/encounter_boss_metrics.html b/raidar/templates/raidar/encounter_boss_metrics.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="table-container uk-margin-top">
   {% include 'raidar/encounter_row_header.html' %}
   <div class="r-encounter-stats-container r-encounter-mechanics-container uk-margin-remove-bottom uk-background-default" style="z-index: 980;" uk-sticky="bottom: #offset">

diff --git a/raidar/templates/raidar/encounter_buffs.html b/raidar/templates/raidar/encounter_buffs.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% comment %}
 XXX Currently, all of the buffs are in a single table, looked up by `data.buff_tabs[5]`
 However, there's other five tabs just waiting to happen (according to #216)

diff --git a/raidar/templates/raidar/encounter_combat_data.html b/raidar/templates/raidar/encounter_combat_data.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="table-container uk-margin-top">
   {% include 'raidar/encounter_row_header.html' %}
   <div class="r-encounter-stats-container uk-background-default uk-margin-remove-bottom" style="z-index: 980;" uk-sticky="bottom: #offset">

diff --git a/raidar/templates/raidar/encounter_row_header.html b/raidar/templates/raidar/encounter_row_header.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <!-- <table class="uk-table uk-position-z-index stats row-header">
   <tbody>
     <tr>

diff --git a/raidar/templates/raidar/encounters.html b/raidar/templates/raidar/encounters.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="table-container">
 <button class="uk-button" on-click="encounter_filter_toggle">[[settings.encounterSort.filters ? 'Show' : 'Hide']] Filters <i class="material-icons">filter_list</i></button>
 [[#if settings.encounterSort.filter.any]]

diff --git a/raidar/templates/raidar/global_stats.html b/raidar/templates/raidar/global_stats.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 
 [[#with global_stats]]
   <div id="content">

diff --git a/raidar/templates/raidar/index.html b/raidar/templates/raidar/index.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <!DOCTYPE html>
 <html lang="en">
   <head>

diff --git a/raidar/templates/raidar/info_api.html b/raidar/templates/raidar/info_api.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <h2>GW2 Raidar API</h2>
 
 <p>

diff --git a/raidar/templates/raidar/info_framework.html b/raidar/templates/raidar/info_framework.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="uk-column-1-2">
   <h1>Heading</h1>
   <h2>Heading</h2>

diff --git a/raidar/templates/raidar/info_help.html b/raidar/templates/raidar/info_help.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 
 <div uk-grid>
   <div class="uk-width-1-6@m uk-width-1-1">

diff --git a/raidar/templates/raidar/intro.html b/raidar/templates/raidar/intro.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <h2>What is is GW2 Raidar?</h2>
 
 <p>With the advent and increased usage of DPS meters in <a href="https://www.guildwars2.com/">Guild Wars 2</a> Raid scene, there have been a number of different parsers released to analyse, in detail, combat statistics and logs for post review.</p>

diff --git a/raidar/templates/raidar/leaderboards.html b/raidar/templates/raidar/leaderboards.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <div class="uk-grid uk-grid-item-match">
   {# Mobile navigation/filtering #}
   <h6 class="uk-font-family-secondary uk-hidden@s uk-margin-bottom">Encounter Filter</h6>

diff --git a/raidar/templates/raidar/profile.html b/raidar/templates/raidar/profile.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 [[#with profile]]
   [[#with profile.era[page.era]]]
     [[#with profile]]

diff --git a/raidar/views.py b/raidar/views.py
@@ -8,7 +8,7 @@
 from django.contrib.auth.forms import PasswordChangeForm, PasswordResetForm
 from django.contrib.auth.models import User
 from django.contrib.auth.tokens import default_token_generator
-from django.contrib.staticfiles.templatetags.staticfiles import static
+from django.templatetags.static import static
 from django.core import serializers
 from django.core.mail import EmailMessage
 from django.views.decorators.csrf import csrf_exempt