Merge branch 'release/0.2.3' into production

* release/0.2.3:
  add version number
  remove attribute readonly_fields from UserAdmin
  remove unused import

docs/changelog.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+* :release:`0.2.3 <2014-12-26>`
+* :bug:`-` remove attribute readonly_fields from
+  :py:class:`osusers.admin.UserAdmin` to make saving of additional groups work
+
 * :release:`0.2.2 <2014-12-26>`
 * :feature:`-` home and mail base directory creation
 

docs/conf.py

@@ -55,9 +55,9 @@ copyright = u'2014, Jan Dittberner'
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.2'
+version = '0.2.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.2'
+release = '0.2.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

gnuviechadmin/osusers/admin.py

@@ -65,7 +65,6 @@ class UserCreationForm(forms.ModelForm):
 
 class UserAdmin(admin.ModelAdmin):
     actions = ['perform_delete_selected']
-    readonly_fields = ['uid']
     add_form = UserCreationForm
     inlines = [AdditionalGroupInline, ShadowInline]
 

gnuviechadmin/osusers/models.py

@@ -13,8 +13,6 @@ from django.utils.translation import ugettext as _
 
 from model_utils.models import TimeStampedModel
 
-from celery.result import AsyncResult
-
 from passlib.hash import sha512_crypt
 from passlib.utils import generate_password