Fix error with revision check during saving.

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

diff --git a/src/wiki/forms.py b/src/wiki/forms.py
index 084ae46..f7827bc 100644 (file)
--- a/src/wiki/forms.py
+++ b/src/wiki/forms.py
@@ -2,19 +2,19 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 from documents.models import Chunk
 
 
 class DocumentPubmarkForm(forms.Form):
     """
 
 from documents.models import Chunk
 
 
 class DocumentPubmarkForm(forms.Form):
     """

-        Form for marking revisions for publishing.
+        Form for approving revisions.

     """
 
     id = forms.CharField(widget=forms.HiddenInput)
     publishable = forms.BooleanField(required=False, initial=True,
     """
 
     id = forms.CharField(widget=forms.HiddenInput)
     publishable = forms.BooleanField(required=False, initial=True,

-            label=_('Publishable'))
+            label=_('Approved'))

     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 


@@ -58,8 +58,8 @@ class DocumentTextSaveForm(forms.Form):
     )
 
     publishable = forms.BooleanField(required=False, initial=False,
     )
 
     publishable = forms.BooleanField(required=False, initial=False,

-        label=_('Publishable'),
-        help_text=_(u"Mark this revision as publishable.")
+        label=_('Approve'),
+        help_text=_("Approve this revision.")

     )
 
     def __init__(self, *args, **kwargs):
     )
 
     def __init__(self, *args, **kwargs):


@@ -68,6 +68,14 @@ class DocumentTextSaveForm(forms.Form):
         if user and user.is_authenticated:
             self.fields['author_name'].required = False
             self.fields['author_email'].required = False
         if user and user.is_authenticated:
             self.fields['author_name'].required = False
             self.fields['author_email'].required = False

+            try:
+                user.profile
+            except:
+                pass
+            else:
+                if user.profile.approve_by_default:
+                    self.fields['publishable'].initial = True
+

         return r
 
 
         return r