Skip to content

Commit 1b5b6a6

Browse files
committed
fix
1 parent 4dbb2dc commit 1b5b6a6

31 files changed

+15
-42
lines changed

etsd/core/forms.py

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ def get_ldap_user(con, user):
2222

2323

2424
def ldap_check(usernames):
25-
2625
con = init_ldap_con()
2726
for un in usernames:
2827
if un.username in ["root", "pir", "raf", "lav", "hr_user", "mark_user"]:

etsd/core/migrations/0001_initial.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
initial = True
98

109
dependencies = []

etsd/core/views.py

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ class AuthorityListView(ListView):
8282
context_object_name = "authorities"
8383

8484
def get_queryset(self):
85-
8685
qs = (
8786
super()
8887
.get_queryset()

etsd/keys/migrations/0001_initial.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
initial = True
109

1110
dependencies = [

etsd/keys/migrations/0002_initial.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
class Migration(migrations.Migration):
9-
109
initial = True
1110

1211
dependencies = [

etsd/keys/migrations/0003_alter_publickey_confirmation_document.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
dependencies = [
109
("keys", "0002_initial"),
1110
]

etsd/keys/migrations/0004_auto_20210826_0833.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
dependencies = [
109
("keys", "0003_alter_publickey_confirmation_document"),
1110
]

etsd/keys/migrations/0005_publickey_deleted_on.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
("keys", "0004_auto_20210826_0833"),
109
]

etsd/keys/migrations/0006_alter_publickey_created_by_and_more.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
class Migration(migrations.Migration):
9-
109
dependencies = [
1110
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
1211
("keys", "0005_publickey_deleted_on"),

etsd/msgs/migrations/0001_initial.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
initial = True
109

1110
dependencies = [

etsd/msgs/migrations/0002_initial.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
class Migration(migrations.Migration):
9-
109
initial = True
1110

1211
dependencies = [

etsd/msgs/migrations/0003_alter_message_category.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
dependencies = [
109
("msgs", "0002_initial"),
1110
]

etsd/msgs/migrations/0004_alter_message_status.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
("msgs", "0003_alter_message_category"),
109
]

etsd/msgs/migrations/0005_auto_20210812_2124.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
("msgs", "0004_alter_message_status"),
109
]

etsd/msgs/migrations/0006_auto_20210813_1522.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
dependencies = [
109
("msgs", "0005_auto_20210812_2124"),
1110
]

etsd/msgs/migrations/0007_alter_message_available_to_sender.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
("msgs", "0006_auto_20210813_1522"),
109
]

etsd/msgs/migrations/0008_auto_20210816_1154.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
dependencies = [
109
("msgs", "0007_alter_message_available_to_sender"),
1110
]

etsd/msgs/migrations/0009_alter_participant_kind.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
("msgs", "0008_auto_20210816_1154"),
109
]

etsd/msgs/migrations/0010_alter_message_available_to_sender.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
("msgs", "0009_alter_participant_kind"),
109
]

etsd/msgs/migrations/0011_message_local_protocol.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
dependencies = [
109
("msgs", "0010_alter_message_available_to_sender"),
1110
]

etsd/msgs/migrations/0012_alter_message_local_protocol.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
dependencies = [
109
("msgs", "0011_message_local_protocol"),
1110
]

etsd/msgs/migrations/0013_auto_20210819_0903.py

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66

77
class Migration(migrations.Migration):
8-
98
dependencies = [
109
("msgs", "0012_alter_message_local_protocol"),
1110
]

etsd/msgs/migrations/0014_auto_20210907_0028.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
("msgs", "0013_auto_20210819_0903"),
109
]

etsd/msgs/migrations/0015_auto_20210907_0042.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
98
("msgs", "0014_auto_20210907_0028"),
109
]

etsd/msgs/migrations/0016_alter_data_created_by_alter_data_modified_by_and_more.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
class Migration(migrations.Migration):
9-
109
dependencies = [
1110
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
1211
("msgs", "0015_auto_20210907_0042"),

etsd/users/migrations/0001_initial.py

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88

99
class Migration(migrations.Migration):
10-
1110
initial = True
1211

1312
dependencies = [

etsd/users/migrations/0002_usermanagementlog.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
class Migration(migrations.Migration):
9-
109
dependencies = [
1110
("authorities", "0003_authority_email"),
1211
("users", "0001_initial"),

etsd/users/migrations/0003_alter_usermanagementlog_created_by_and_more.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
class Migration(migrations.Migration):
9-
109
dependencies = [
1110
("users", "0002_usermanagementlog"),
1211
]

etsd/users/models.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from authorities.models import Authority
66
from etsd.core.models import UserDateAbstractModel
77

8+
89
# Use custom user model by default as per
910
# https://docs.djangoproject.com/en/2.0/topics/auth/customizing/#using-a-custom-user-model-when-starting-a-project
1011
class User(AbstractUser):

requirements/base.txt

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
crispy-bootstrap5==0.7
2-
Django==4.2
3-
django-auth-ldap==4.2.0
2+
Django==4.2.4
3+
django-auth-ldap==4.5.0
44
django-authorities==0.4.2
5-
django-autocomplete-light==3.9.4
6-
django-browser-reload==1.7.0
7-
django-cleanup==7.0.0
8-
django-compressor==4.3.1
5+
django-autocomplete-light==3.9.7
6+
django-cleanup==8.0.0
7+
django-compressor==4.4
98
django-crispy-forms==2.0
10-
django-email-log==1.3.0
11-
django-extensions==3.2.1
9+
django-email-log==1.4.0
10+
django-extensions==3.2.3
1211
django-extra-views==0.14.0
13-
django-filter==23.1
12+
django-filter==23.2
1413
django-memoize==2.3.1
1514
django-reversion==5.0.4
1615
django-rules-light==0.3.2
1716
django-sendfile2==0.7.0
1817
dj-rest-auth==2.1.11
1918
djangorestframework==3.14.0
2019
django-simple-stats==0.4.0
21-
django-tables2==2.5.3
22-
django-tables2-column-shifter==2.0.3
20+
django-tables2==2.6.0
21+
django-tables2-column-shifter==2.2.0
2322
django-tools==0.54.0
2423
django-widget-tweaks==1.4.12
2524
openpyxl==3.1.2
@@ -28,7 +27,7 @@ python-ldap==3.4.0
2827
pytz==2023.3
2928
requests==2.27.1
3029
six==1.16.0
31-
tablib==3.4.0
32-
Werkzeug==2.2.3
30+
tablib==3.5.0
31+
Werkzeug==2.3.6
3332
xlrd==2.0.1
3433
xlwt==1.3.0

requirements/dev.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
-r base.txt
22

3-
django-debug-toolbar==4.0.0
3+
django-browser-reload==1.11.0
4+
django-debug-toolbar==4.1.0
45
fab-classic==1.19.2
56
black==23.3.0
67
pylint==2.17.2

0 commit comments

Comments
 (0)