--- a/server/src/metaeducation/__init__.py Thu Apr 21 12:04:32 2016 +0200
+++ b/server/src/metaeducation/__init__.py Thu Apr 21 16:25:15 2016 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 0, 12, "final", 0)
+VERSION = (0, 0, 14, "final", 0)
VERSION_STR = ".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))
--- a/server/src/metaeducation/admin.py Thu Apr 21 12:04:32 2016 +0200
+++ b/server/src/metaeducation/admin.py Thu Apr 21 16:25:15 2016 +0200
@@ -1,6 +1,7 @@
from django import forms
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
+from django.contrib.auth.forms import UserChangeForm as BaseUserChangeForm
from django.contrib.auth.forms import ReadOnlyPasswordHashField
from django.utils.translation import ugettext, ugettext_lazy as _
@@ -34,16 +35,15 @@
return user
-class UserChangeForm(forms.ModelForm):
+class UserChangeForm(BaseUserChangeForm):
"""A form for updating users. Includes all the fields on
the user, but replaces the password field with admin's
password hash display field.
"""
- password = ReadOnlyPasswordHashField()
- class Meta:
+ class Meta(BaseUserChangeForm.Meta):
model = User
- fields = ('external_id', 'username', 'uai', 'first_name', 'last_name', 'password', 'is_active', 'is_staff')
+ # fields = ('external_id', 'username', 'uai', 'first_name', 'last_name', 'password', 'is_active', 'is_staff')
class UserAdmin(BaseUserAdmin):
@@ -54,12 +54,11 @@
# The fields to be used in displaying the User model.
# These override the definitions on the base UserAdmin
# that reference specific fields on auth.User.
- list_display = ('external_id', 'username', 'uai', 'first_name', 'last_name', 'password', 'is_staff')
+ list_display = ('external_id', 'username', 'uai', 'first_name', 'last_name')
list_filter = ('is_staff',)
fieldsets = (
- (None, {'fields': ('external_id', 'username')}),
- (_('Personal info'), {'fields': ('username', 'uai', 'first_name', 'last_name')}),
- (_('Permissions'), {'fields': ('is_staff',)}),
+ (None, {'fields': ('external_id', 'username', 'password')}),
+ (_('Personal info'), {'fields': ('uai', 'first_name', 'last_name')}),
(_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
'groups', 'user_permissions')}),
(_('Important dates'), {'fields': ('last_login', 'date_joined')}),
--- a/server/src/requirement_iri.txt Thu Apr 21 12:04:32 2016 +0200
+++ b/server/src/requirement_iri.txt Thu Apr 21 16:25:15 2016 +0200
@@ -1,1 +1,1 @@
-renkanmanager (==0.12.18)
+renkanmanager (==0.12.19)