make user decorated name decoratable through OSQA modules, allow superusers to edit...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1245 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index e356f0744655e1cb483035462145f235ed21add1..3679602d31063f3147a7b523168eb13a893598a5 100644 (file)
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
 from django.utils.encoding import smart_unicode
 from general import NextUrlField, UserNameField
 
 from django.utils.encoding import smart_unicode
 from general import NextUrlField, UserNameField
 

-from forum import settings
+from forum import settings, REQUEST_HOLDER

 
 from forum.modules import call_all_handlers
 
 
 from forum.modules import call_all_handlers
 


@@ -307,7 +307,7 @@ class EditUserForm(forms.Form):
 
     def __init__(self, user, *args, **kwargs):
         super(EditUserForm, self).__init__(*args, **kwargs)
 
     def __init__(self, user, *args, **kwargs):
         super(EditUserForm, self).__init__(*args, **kwargs)

-        if settings.EDITABLE_SCREEN_NAME:
+        if settings.EDITABLE_SCREEN_NAME or (REQUEST_HOLDER.request.user.is_authenticated() and REQUEST_HOLDER.request.user.is_superuser):

             self.fields['username'] = UserNameField(label=_('Screen name'))
             self.fields['username'].initial = user.username
             self.fields['username'].user_instance = user
             self.fields['username'] = UserNameField(label=_('Screen name'))
             self.fields['username'].initial = user.username
             self.fields['username'].user_instance = user

diff --git a/forum/models/user.py b/forum/models/user.py
index 695501f53113a531b41c67ecc97ff979bbe071a3..cf47c6653e78b2eaae6f68b5e8ae5039b5c5b8a4 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -165,8 +165,8 @@ class User(BaseModel, DjangoUser):
         #todo: temporary thing, for now lets just assume that the site owner will always be the first user of the application
         return self.id == 1
 
         #todo: temporary thing, for now lets just assume that the site owner will always be the first user of the application
         return self.id == 1
 

-    @property
-    def decorated_name(self):
+
+    def _decorated_name(self):

         username = smart_unicode(self.username)
 
         if len(username) > TRUNCATE_USERNAMES_LONGER_THAN and TRUNCATE_LONG_USERNAMES:
         username = smart_unicode(self.username)
 
         if len(username) > TRUNCATE_USERNAMES_LONGER_THAN and TRUNCATE_LONG_USERNAMES:


@@ -181,6 +181,10 @@ class User(BaseModel, DjangoUser):
 
         return username
 
 
         return username
 

+    @property
+    def decorated_name(self):
+        return self._decorated_name()
+

     @property
     def last_activity(self):
         try:
     @property
     def last_activity(self):
         try: