From d05a1d784f2f0dbad6839c672cae8226d1b0fa9d Mon Sep 17 00:00:00 2001
From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Wed, 30 Nov 2011 16:24:21 +0100
Subject: [PATCH 1/1] publishable in save dialog

---
 apps/wiki/forms.py                            |   5 +++
 apps/wiki/locale/pl/LC_MESSAGES/django.mo     | Bin 3550 -> 3648 bytes
 apps/wiki/locale/pl/LC_MESSAGES/django.po     |  33 ++++++++++--------
 .../wiki/templates/wiki/document_details.html |   4 ++-
 apps/wiki/templates/wiki/save_dialog.html     |   9 +++++
 .../templates/wiki/tabs/history_view.html     |   2 ++
 apps/wiki/views.py                            |   4 +++
 7 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 394b823b..3ef3ed14 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -59,6 +59,11 @@ class DocumentTextSaveForm(forms.Form):
         help_text=_(u"If you completed a life cycle stage, select it."),
     )
 
+    publishable = forms.BooleanField(required=False, initial=False,
+        label=_('Publishable'),
+        help_text=_(u"Mark this revision as publishable.")
+    )
+
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
         r = super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.mo b/apps/wiki/locale/pl/LC_MESSAGES/django.mo
index 96287ca27c145d90f1ca22a9ff164ba77b6f5a36..d886dcecd0cc8b1f59469d0a1177d016c2f413fa 100644
GIT binary patch
delta 1452
zcmYk+OGs2v9LMqFIGUzuKC*n})oM($@s*EEqsOL<5E98nMdJe<M;w{)K?V*kT7(3G
z^df8#Eef)taT7!c8Pz7KO|8^g7DTS1Y|;0JN9b_>_jAvgx##@PgS(VFpBGt5cV9P@
z!$cmD>@ubm|Hg8ooQN|f2~T1?wqXjMv-N<jhcJuw3CzV?xE1Fx5np2}E@BQYW05ft
z^M?lwkWcTj1UF#~Zo?*YW2<d%$8zcyF%73M8SkMIdx9G1C1&7zWFYeu)qfnFtG_f%
zWqgyxgMRQJm#N~GfDN|&xNUDi4RjXi%XFaz3Ro|rI-bNGIEDJ(Lrlk~sBvB)ms#YN
z#rWnE52g46SqziS==wu}wHP&UIc~v5Ycp0*Z$~ZhRn&Xa$Yt(u(=OgeCH4T-|Ex8N
z5oP$C2QD+uZ8FA~cedWPdHsb8sDZms{|{k4UcyYgiCW@Es6AgqF0;Z-EA$<;0&A$V
zk-{=)LZwNpzkaBrL76wB4&fP8ra@F<!>BzUM<wzYxy%c0TI#o`fxe&;T179$GYXHU
z2DL&*aXX$uF4LLJ`fH#;YRY&7)xiWRp&PdSuJs`*;W^Yy-=J3Hv#l@N`cKs1{Dn#^
zk*s+%*_e$U^x%;Q59*)?HPZoGA4Q$!aa0G_tTR|eeHN9#3TkGnsQ1@w-ObCISPCkU
zOk4M$#w$Z5<f=}Y{uY~azL94Yt(J<;jeajyg`#a!|5_w%wUXD_Q(r1{X9@}Jl6LU_
z;+^)nGa{w7sRo+}EwA=YvvY`QLVLpm%zok!p+mNZ*iCE{&0eK}(1)a!&`fs{I^`-_
z5fy!qw4DcyIc9dLg;GZBCA5$FK&aFcC4`o$l2AE76cGCeeI4tfHE}aBMW=nCfHTzV
z4?Cgm5r5bp9B_PLXK=Wq-yiPvb@X?8qaWfOS3-4#Q(4<kQ8)cN!P%(PM++05xx6i7
t1HR5NXK3NJGuj;r_hFwe5OjKiL&4F7D^6E%y}y93v(N91eoRVs{R0@ThwcCX

delta 1367
zcmYk+OK4L;6vpwBcw-WiKJ3F-8%?Z@kET^q6HVKQpwt%XLR3VMf{23KEEH7g?Mf8!
zfgyrW5v1ToT{MV-P+fE(ZbV%QaUlpwcM5I<{eN*P4)@IO&Q0#jnMd*}S?~7iZC=$V
zyNM*>1<elQ;xZ~qF=Q6QAzY55*o+5U`?zbL#8o^mV>e#GR-DBsKE)P%iEHpJ_L%wh
zjT;TnMDMZ-!<fNN96%5Ex##1!jrKuYiPIRz+o;6uqXv3{?KqF>_dTkgy8HZd<GFA4
zof{4K8zUH|p%+?F&y!Rdpcnay<xm3@o#UvEkKt;ZM1AiZw&4`2zgx&<GgMlsS?ptc
zd%+EhU|*2S7M(v(1OLJ%jFO#9;C9TQmi8#>y%We~XQ;G$WmIBkQT<<VPNNdMj6Px4
zsjdag?x5N|EB?NaMGcrky|4$@;(qMFQ^+3LdDLFdAeTL+(h5CCt-x#4nfQpB&`<Z=
zi?RR8Ji+?t@TE|hmQac8MeX$jDv^uGWml=R)KzTkH7cQb<gyP`TA5Fnz^|x*161n2
z8Ogyq;;g@3Oz}X8<lP4)=NM`Rhfp&-jg7r^?J3v3fjW#;R6-At%brnn;R0^NI_mup
zv(W_OJ~w*Mi8{SWR0mn-2oBPoKqYVqHM5(j4(_`41JukOp%R&M?FCf-Z%_%nLw5RK
zsYJZ^<cMo(=~Q%h^krqNqTj0q(~_+xGK9889jhquG_jS?KL1|^DrK+T-{KzSu|#OC
zwSk&yiqI6bQDkTR#4w=)(MxO~mP*du3^@y^Y3o$#sH<psRP-Cu-WEAWjbo~ZSz;5R
zP1V1H$}VCvp>@;mN@WMJj_4!w*SNDb8oC##g~F*|WU!FV<%e_mN`ExH)F{-BMCXFF
ILOd4y0~@el3IG5A

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.po b/apps/wiki/locale/pl/LC_MESSAGES/django.po
index eb51b71b..0182abed 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/django.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-25 14:14+0100\n"
-"PO-Revision-Date: 2011-11-25 14:15+0100\n"
+"POT-Creation-Date: 2011-11-30 16:07+0100\n"
+"PO-Revision-Date: 2011-11-30 16:08+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: \n"
@@ -17,32 +17,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: forms.py:19
-#: views.py:274
+#: forms.py:63
+#: views.py:279
 msgid "Publishable"
 msgstr "Gotowe do publikacji"
 
 #: forms.py:38
-#: forms.py:84
+#: forms.py:89
 msgid "Author"
 msgstr "Autor"
 
 #: forms.py:39
-#: forms.py:85
+#: forms.py:90
 msgid "Your name"
 msgstr "Imię i nazwisko"
 
 #: forms.py:44
-#: forms.py:90
+#: forms.py:95
 msgid "Author's email"
 msgstr "E-mail autora"
 
 #: forms.py:45
-#: forms.py:91
+#: forms.py:96
 msgid "Your email address, so we can show a gravatar :)"
 msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)"
 
 #: forms.py:51
-#: forms.py:97
+#: forms.py:102
 msgid "Your comments"
 msgstr "Twój komentarz"
 
@@ -58,7 +59,11 @@ msgstr "Ukończono"
 msgid "If you completed a life cycle stage, select it."
 msgstr "Jeśli został ukończony etap prac, wskaż go."
 
-#: forms.py:98
+#: forms.py:64
+msgid "Mark this revision as publishable."
+msgstr "Oznacz tę wersję jako gotową do publikacji."
+
+#: forms.py:103
 msgid "Describe the reason for reverting."
 msgstr "Opisz powód przywrócenia."
 
@@ -74,11 +79,11 @@ msgstr "motyw"
 msgid "themes"
 msgstr "motywy"
 
-#: views.py:294
+#: views.py:299
 msgid "Revision marked"
 msgstr "Wersja oznaczona"
 
-#: views.py:296
+#: views.py:301
 msgid "Nothing changed"
 msgstr "Nic nie uległo zmianie"
 
@@ -164,15 +169,15 @@ msgstr "Galeria"
 msgid "Compare versions"
 msgstr "Porównaj wersje"
 
-#: templates/wiki/tabs/history_view.html:7
+#: templates/wiki/tabs/history_view.html:8
 msgid "Mark for publishing"
 msgstr "Oznacz do publikacji"
 
-#: templates/wiki/tabs/history_view.html:9
+#: templates/wiki/tabs/history_view.html:11
 msgid "Revert document"
 msgstr "Przywróć wersję"
 
-#: templates/wiki/tabs/history_view.html:12
+#: templates/wiki/tabs/history_view.html:14
 msgid "View version"
 msgstr "Zobacz wersję"
 
diff --git a/apps/wiki/templates/wiki/document_details.html b/apps/wiki/templates/wiki/document_details.html
index d95603f6..db003d2c 100644
--- a/apps/wiki/templates/wiki/document_details.html
+++ b/apps/wiki/templates/wiki/document_details.html
@@ -43,5 +43,7 @@
     {% include "wiki/save_dialog.html" %}
     {% include "wiki/revert_dialog.html" %}
     {% include "wiki/tag_dialog.html" %}
-    {% include "wiki/pubmark_dialog.html" %}
+    {% if can_pubmark %}
+        {% include "wiki/pubmark_dialog.html" %}
+    {% endif %}
 {% endblock %}
diff --git a/apps/wiki/templates/wiki/save_dialog.html b/apps/wiki/templates/wiki/save_dialog.html
index c34eb9ec..31c5b014 100644
--- a/apps/wiki/templates/wiki/save_dialog.html
+++ b/apps/wiki/templates/wiki/save_dialog.html
@@ -33,6 +33,15 @@
 		<span class="help_text">{{ forms.text_save.stage_completed.help_text }}</span>
 		<span data-ui-error-for="{{ forms.text_save.stage_completed.name }}"> </span>
 	</p>
+    {% if can_pubmark %}
+	<p>
+		{{ forms.text_save.publishable.label_tag }}:
+		{{ forms.text_save.publishable }}
+		<span class="help_text">{{ forms.text_save.publishable.help_text }}</span>
+		<span data-ui-error-for="{{ forms.text_save.publishable.name }}"> </span>
+	</p>
+    {% endif %}
+
 	{% endif %}
 
 
diff --git a/apps/wiki/templates/wiki/tabs/history_view.html b/apps/wiki/templates/wiki/tabs/history_view.html
index c363cef4..0d662a7f 100644
--- a/apps/wiki/templates/wiki/tabs/history_view.html
+++ b/apps/wiki/templates/wiki/tabs/history_view.html
@@ -3,8 +3,10 @@
     <div class="toolbar">
     	<button type="button" id="make-diff-button"
 			data-enabled-when="2" disabled="disabled">{% trans "Compare versions" %}</button>
+        {% if can_pubmark %}
 		<button type="button" id="pubmark-changeset-button"
 			data-enabled-when="1" disabled="disabled">{% trans "Mark for publishing" %}</button>
+        {% endif %}
 		<button type="button" id="doc-revert-button"
 			data-enabled-when="1" disabled="disabled">{% trans "Revert document" %}</button>
 		<button id="open-preview-button" disabled="disabled"
diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index f58e03a4..0356d509 100644
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -69,6 +69,7 @@ def editor(request, slug, chunk=None, template_name='wiki/document_details.html'
             "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"),
             "pubmark": forms.DocumentPubmarkForm(prefix="pubmark"),
         },
+        'can_pubmark': request.user.has_perm('catalogue.can_pubmark'),
         'REDMINE_URL': settings.REDMINE_URL,
     })
 
@@ -125,6 +126,8 @@ def text(request, chunk_id):
                 parent = None
             stage = form.cleaned_data['stage_completed']
             tags = [stage] if stage else []
+            publishable = (form.cleaned_data['publishable'] and
+                    request.user.has_perm('catalogue.can_pubmark'))
             doc.commit(author=author,
                        text=text,
                        parent=parent,
@@ -132,6 +135,7 @@ def text(request, chunk_id):
                        tags=tags,
                        author_name=form.cleaned_data['author_name'],
                        author_email=form.cleaned_data['author_email'],
+                       publishable=publishable,
                        )
             revision = doc.revision()
             return JSONResponse({
-- 
2.20.1