#1831: populate user data from CAS

[redakcja.git] / apps / wiki / forms.py

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index a8a57c8..394b823 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -30,17 +30,17 @@ class DocumentTextSaveForm(forms.Form):
 
     """
 
 
     """
 

-    parent_revision = forms.IntegerField(widget=forms.HiddenInput)
+    parent_revision = forms.IntegerField(widget=forms.HiddenInput, required=False)

     text = forms.CharField(widget=forms.HiddenInput)
 
     author_name = forms.CharField(
     text = forms.CharField(widget=forms.HiddenInput)
 
     author_name = forms.CharField(

-        required=False,
+        required=True,

         label=_(u"Author"),
         help_text=_(u"Your name"),
     )
 
     author_email = forms.EmailField(
         label=_(u"Author"),
         help_text=_(u"Your name"),
     )
 
     author_email = forms.EmailField(

-        required=False,
+        required=True,

         label=_(u"Author's email"),
         help_text=_(u"Your email address, so we can show a gravatar :)"),
     )
         label=_(u"Author's email"),
         help_text=_(u"Your email address, so we can show a gravatar :)"),
     )


@@ -59,6 +59,14 @@ class DocumentTextSaveForm(forms.Form):
         help_text=_(u"If you completed a life cycle stage, select it."),
     )
 
         help_text=_(u"If you completed a life cycle stage, select it."),
     )
 

+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop('user')
+        r = super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
+        if user and user.is_authenticated():
+            self.fields['author_name'].required = False
+            self.fields['author_email'].required = False
+        return r
+

 
 class DocumentTextRevertForm(forms.Form):
     """
 
 class DocumentTextRevertForm(forms.Form):
     """