Skip to content

Commit 6d16c44

Browse files
author
Marcus Funch
committed
Merge branch 'release/5.10.3' into 'master'
Release 5.10.3 See merge request os2borgerpc/os2borgerpc-admin-site!386
2 parents 03b87a8 + 75c7884 commit 6d16c44

27 files changed

+166
-1209
lines changed

NEWS.rst

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1-
Version 5.10.1, January 12, 2023
1+
Version 5.10.3, February 2, 2023
22
--------------------------------
33

4-
- Give proper errors and error messages when attempting to name a user an existing name, or visiting a
4+
- Update Django version to latest patch release: 3.2.17
5+
- Run most recent black version
6+
- And info on how to build the documentation
7+
- Update the documentation
8+
- Show OS2BPC client version in the backend for the PC table
9+
10+
Version 5.10.2, January 12, 2023
11+
--------------------------------
12+
13+
- Give proper errors and error messages when attempting to name a user an existing name, or visiting a
514
group by a nonexisting ID.
615
- Don't give a server error when using one of the new global script redirects and you aren't logged in.
716
Redirect to the login page instead.
@@ -100,7 +109,7 @@ New in this version:
100109
a policy
101110

102111
Version 5.7.0, July 12, 2022
103-
---------------------------
112+
----------------------------
104113

105114
New in this version:
106115

@@ -111,7 +120,7 @@ New in this version:
111120
- Fix to remove redudant filename for policy scripts
112121

113122
Version 5.6.5, June 28, 2022
114-
---------------------------
123+
----------------------------
115124

116125
New in this version:
117126

@@ -120,7 +129,7 @@ New in this version:
120129
- Make associated scripts easily editable in Django Admin
121130

122131
Version 5.6.4, June 21, 2022
123-
---------------------------
132+
----------------------------
124133

125134
New in this version:
126135

README.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,3 @@ The system was prepared by Magenta: See http://www.magenta.dk
2222

2323
All code is made available under Version 3 of the GNU General Public
2424
License - see the LICENSE file for details.
25-
26-
Models / Database visualized
27-
============================
28-
29-
.. image:: models_graphed.png
30-
:target: /models_graphed.png

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.10.2
1+
5.10.3

admin_site/account/admin.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@ class SiteMembershipInline(admin.TabularInline):
4040
@admin.register(UserProfile)
4141
class MyUserProfileAdmin(admin.ModelAdmin):
4242
inlines = [SiteMembershipInline]
43+
list_display = ("user",)
44+
list_filter = ("sites",)
45+
search_fields = ("user__username",)

admin_site/manage.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import sys
44

55
if __name__ == "__main__":
6-
76
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "os2borgerpc_admin.settings")
87

98
from django.core.management import execute_from_command_line

admin_site/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
crispy-bootstrap5==0.6
2-
Django==3.2.15
2+
Django==3.2.17
33
django-crispy-forms==1.14.0
44
django-extensions==3.2.0
55
ipython==8.4.0
Binary file not shown.
Binary file not shown.
162 KB
Loading
234 KB
Loading

0 commit comments

Comments
 (0)