X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4fae06ea1b9fec1a45482ac043aa049ebce3f465..18948ce1d84878c6307f2d0b732a9dbd03778cfb:/src/wiki/forms.py?ds=sidebyside

diff --git a/src/wiki/forms.py b/src/wiki/forms.py
index 46194677..f7827bc1 100644
--- a/src/wiki/forms.py
+++ b/src/wiki/forms.py
@@ -9,12 +9,12 @@ 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,
-            label=_('Publishable'))
+            label=_('Approved'))
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 
@@ -58,8 +58,8 @@ class DocumentTextSaveForm(forms.Form):
     )
 
     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):
@@ -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
+            try:
+                user.profile
+            except:
+                pass
+            else:
+                if user.profile.approve_by_default:
+                    self.fields['publishable'].initial = True
+
         return r