Skip to content

Commit 53caaab

Browse files
t33nsyt33nsy
committed
Replaced url_for('static',..) with versioned_url()
1 parent b442abe commit 53caaab

20 files changed

+84
-78
lines changed

‎app/config.py‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,26 @@ def init_config(config_path):
2828

2929
class VersionCache:
3030
_instance = None
31-
31+
_initialized = False
32+
3233
def __new__(cls):
3334
if cls._instance is None:
3435
cls._instance = super().__new__(cls)
36+
return cls._instance
37+
38+
def __init__(self):
39+
if not self.__class__._initialized:
3540
hash_file = os.getenv("APP_STATIC_HASH_FILE", "dev")
3641
if hash_file and os.path.exists(hash_file):
3742
with open(hash_file) as f:
38-
cls._instance.version=f.read().split()
43+
self.version=f.read().split()
3944
else:
40-
cls._instance.version = "dev"
41-
return cls._instance
42-
45+
self.version = "dev"
46+
self.__class__._initialized = True
47+
4348
@classmethod
4449
def get_version(cls):
45-
return cls().version
50+
if cls._instance is None or not hasattr(cls._instance, "version"):
51+
cls._instance = cls()
52+
return cls._instance.version
53+
_instance = None

‎app/routes/admin.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
from app.root_logger import get_root_logger
22

33
from flask import render_template, redirect, Blueprint
4-
from flask.helpers import url_for
5-
4+
from flask.helpers import url_for
65
from app.api.dump import get_dumps_info
76
from app.lti_session_passback.auth_checkers import check_admin
87

‎app/templates/base.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
{% block header %}
44
{% include "header.html" %}
5-
<link rel="stylesheet" href="{{ url_for('static', filename='css/libraries/bootstrap.min.css') }}">
5+
<link rel="stylesheet" href="{{ versioned_url('css/libraries/bootstrap.min.css') }}">
66
{% endblock %}
77

88
{% include "user_info.html" %}
@@ -16,7 +16,7 @@ <h1>{{ page_title }}</h1>
1616
{% block content %} {% endblock %}
1717
<!--{% include "bug_reports.html" %}-->
1818
{% block footer %} {% include "footer.html" %} {% endblock %}
19-
<script src="{{ url_for('static', filename='js/base.js') }}"></script>
19+
<script src="{{ versioned_url('js/base.js') }}"></script>
2020
</body>
2121

2222
</html>

‎app/templates/capacity.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h4 class="card-title">Загруженность Базы Данных</h4>
1616
</div>
1717
<button type="button" id="refresh_button">Обновить данные</button>
1818

19-
<script src="/static/js/libraries/jquery.min.js"></script>
19+
<script src="{{ versioned_url('/static/js/libraries/jquery.min.js') }}"></script>
2020
<script>
2121
$('#refresh_button').click(function() {
2222
$.post("{{ url_for('routes_capacity.refresh_capacity') }}", {}, function(data) {

‎app/templates/criterion_list.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% extends 'base.html' %}
22

33
{% block header %}
4-
<link rel="stylesheet" href="/static/css/danger-alert.css">
5-
<link rel="stylesheet" href="/static/css/libraries/codemirror.min.css">
6-
<link rel="stylesheet" href="/static/css/spinner.css">
4+
<link rel="stylesheet" href="{{ versioned_url('/static/css/danger-alert.css') }}">
5+
<link rel="stylesheet" href="{{ versioned_url('/static/css/libraries/codemirror.min.css') }}">
6+
<link rel="stylesheet" href="{{ versioned_url('/static/css/spinner.css') }}">
77
{% endblock %}
88

99
{% block content %}

‎app/templates/criterions.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% extends 'base.html' %}
22

33
{% block header %}
4-
<link rel="stylesheet" href="/static/css/danger-alert.css">
5-
<link rel="stylesheet" href="/static/css/libraries/codemirror.min.css">
6-
<link rel="stylesheet" href="/static/css/spinner.css">
4+
<link rel="stylesheet" href="{{ versioned_url('/static/css/danger-alert.css') }}">
5+
<link rel="stylesheet" href="{{ versioned_url('/static/css/libraries/codemirror.min.css') }}">
6+
<link rel="stylesheet" href="{{ versioned_url('/static/css/spinner.css') }}">
77
{% endblock %}
88

99
{% block content %}
@@ -56,8 +56,8 @@ <h3>{{ t("Редактирование критерия") }}</h3>
5656
<textarea id="criterion_parameters" rows=5>{{ data['info'] }} </textarea>
5757
</form>
5858

59-
<script src="/static/js/libraries/jquery.min.js"></script>
60-
<script src="/static/js/libraries/codemirror.min.js"></script>
61-
<script src="/static/js/criterion.js"></script>
59+
<script src="{{ versioned_url('/static/js/libraries/jquery.min.js') }}"></script>
60+
<script src="{{ versioned_url('/static/js/libraries/codemirror.min.js') }}"></script>
61+
<script src="{{ versioned_url('/static/js/criterion.js') }}"></script>
6262

6363
{% endblock %}

‎app/templates/dumps.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<label for="createDump">{{ t("Используйте с осторожностью! Может заблокировать сервис из-за активной работы с БД") }}</i>
2929
</div>
3030

31-
<script src="{{ url_for('static', filename='js/libraries/jquery.min.js') }}"></script>
31+
<script src="{{ versioned_url('js/libraries/jquery.min.js') }}"></script>
3232
<script type="text/javascript">
3333
$(".createDumpButton").click(function(){
3434
$(this).text('{{ t("Создание...")}}')

‎app/templates/pack_list.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% extends 'base.html' %}
22

33
{% block header %}
4-
<link rel="stylesheet" href="/static/css/danger-alert.css">
5-
<link rel="stylesheet" href="/static/css/libraries/codemirror.min.css">
6-
<link rel="stylesheet" href="/static/css/spinner.css">
4+
<link rel="stylesheet" href="{{ versioned_url('/static/css/danger-alert.css') }}">
5+
<link rel="stylesheet" href="{{ versioned_url('/static/css/libraries/codemirror.min.css') }}">
6+
<link rel="stylesheet" href="{{ versioned_url('/static/css/spinner.css') }}">
77
{% endblock %}
88

99
{% block content %}

‎app/templates/packs.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% extends 'base.html' %}
22

33
{% block header %}
4-
<link rel="stylesheet" href="/static/css/danger-alert.css">
5-
<link rel="stylesheet" href="/static/css/libraries/codemirror.min.css">
6-
<link rel="stylesheet" href="/static/css/spinner.css">
4+
<link rel="stylesheet" href="{{ versioned_url('/static/css/danger-alert.css') }}">
5+
<link rel="stylesheet" href="{{ versioned_url('/static/css/libraries/codemirror.min.css') }}">
6+
<link rel="stylesheet" href="{{ versioned_url('/static/css/spinner.css') }}">
77
{% endblock %}
88

99
{% block content %}
@@ -58,8 +58,8 @@ <h3>{{ t("Редактирование набора критериев") }}</h3>
5858
<input id="button-submit" type="submit" value="{{ t(" Сохранить") }}">
5959
</form>
6060

61-
<script src="/static/js/libraries/jquery.min.js"></script>
62-
<script src="/static/js/libraries/codemirror.min.js"></script>
63-
<script src="/static/js/pack.js"></script>
61+
<script src="{{ versioned_url('/static/js/libraries/jquery.min.js') }}"></script>
62+
<script src="{{ versioned_url('/static/js/libraries/codemirror.min.js') }}"></script>
63+
<script src="{{ versioned_url('/static/js/pack.js') }}"></script>
6464

6565
{% endblock %}

‎app/templates/show_all_presentations.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends 'base.html' %}
22

33
{% block header %}
4-
<link rel="stylesheet" href="{{ url_for('static', filename='css/index.css') }}">
4+
<link rel="stylesheet" href="{{ versioned_url('css/index.css') }}">
55
{% endblock %}
66

77
{% block content %}
@@ -11,8 +11,8 @@
1111
</form>
1212

1313
<table id="all-presentations-table" class="table center-align-table"></table>
14-
<script src="{{ url_for('static', filename='js/utils.js') }}"></script>
15-
<script src="{{ url_for('static', filename='js/show_all_presentations.js') }}"></script>
14+
<script src="{{ versioned_url('js/utils.js') }}"></script>
15+
<script src="{{ versioned_url('js/show_all_presentations.js') }}"></script>
1616
<script type="text/javascript">
1717
call_get_all_presentations();
1818
</script>

0 commit comments

Comments
 (0)