From d21e2da317415d30b56a9f6a1b26e45de7d3070e Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 17 Sep 2012 09:28:42 +0200 Subject: [PATCH] comments: restrict to logged-in users; improve validateion --- compound/book/loops_book_de.dmp | 1 + locales/de/LC_MESSAGES/loops.mo | Bin 19020 -> 19050 bytes locales/de/LC_MESSAGES/loops.po | 5 ++++- organize/comment/browser.py | 10 +++++----- organize/comment/comment_macros.pt | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/compound/book/loops_book_de.dmp b/compound/book/loops_book_de.dmp index 171323d..0d3d92d 100644 --- a/compound/book/loops_book_de.dmp +++ b/compound/book/loops_book_de.dmp @@ -21,6 +21,7 @@ concept(u'issubtype', u'is Subtype', u'predicate', options=u'hide_children', # document types concept(u'keyquestions', u'Leitfragen', u'documenttype') concept(u'textelement', u'Textabschnitt', u'documenttype') +concept(u'textelement2', u'Textabschnitt separat', u'documenttype') concept(u'quote', u'Zitat', u'documenttype') concept(u'story', u'Geschichte', u'documenttype') concept(u'usecase', u'Fallbeispiel', u'documenttype') diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index e3d088f6b48f789fe72174d4b72ff9e04eb4986d..ebb7cbedc511a4b7c1bd788544f33e2447fc6014 100644 GIT binary patch delta 6254 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 delta 6213 zcmX}u3z*JT9>DSc%gh+}%gmS?W*B2I2IDTK%wR+*mz0v)l(q|9w$;Y7^=@iIEuMO* zwl<_fD-@|M-M1T|C$yEMq}r{GT9tCi?)N+Y)4q@6bI$pn>+hWZ`_5O35?dD~l6zaF zEspq%N<>i`oYp9cHj#fW+uA5vRTxEM@KG$sqnLr6Xsi|30Q+El9E^=|2sXvju?Ww@ z7B~wV;vLu|ijvV{GIm^!c3crZh}L5c3AG%Sg&1N-v}*dp#v9UE9?=T*Ps)hhVFC% zvcu@o;C1Nuf54VF4>OoQx<52njt;OcGD6R|jf`?yM);ZU}b3 zv6zp)MNe}9+V3HB+)bEtz<0h#Qf{W4dr*%li6}M55M#Vz(2o|B2atYdDIl9x;=p}s?y=0|k$D^IB7ychf{xdyV;tEw=msm%=gC229O!g(;7Q@Z=K*vhE0Gr^+K60-Xcu}14hK(Qn(u!`r+C7~=m0Iyg%pHx31(2PKnLi9 z={Okc7KSdU7TxK2XvnWbFY}G)&hJ9oEf3G1!q&_my-CIue~cc*0rd4aj&{f{i|ae1 z_5IPKITP)7K6>e{zzn^%!U;B^nTZC9@=7ZqFbpAj64zUOBm7d*NgJ*ow0Bv+sd*otoK9dw@el4Kf@*&iMp zMCORT59M~{Oh&mQx_~nDPIN~Htii@O0v&ifI^MbHCAey0Ep_1YbcXej7d79q590qeu2JHevqg z2QoIS$MS5Dj&^7iY=ur-fG(&9y1%$(1Au`a~y|W!YSzMIwO>C3*|qf6aE$5=yT{o z-@s&DXvoxs2AyCJy5jxl#Q#RlD*6^}|1%na`n>GcH$dBEqy6&H@!AKwhWg%Uga@JR zNA@KC0}@em1{K4on8Se$!ma4QnOsp9l!Fe~1{-53dWkC0zXL`frx#5{U%M2#z}46c z*P;Diz*hJMdRce(BL4p6bC3!LOz#~(C`8Y+2R6rn=l~-_{kTv*ADwV&sJ{_gP@aP> z^j^FWA4WHr#xIr;7>ORmIY}~3G$m9_LqqsG%toI(&?0mJ%g_NH#cX^UeZCcq)ce7Y zkw1{5FVOMo_l^5CMkmfkBa!S##t`;LcQOI}U7sGxbJ2#&&`Y!-_!<^deh-b{PiX(< z{o-%JGPJ%LvvDH&d^-A8{Sg^289hSA37$s3LbsqDJ`43nf=&9zJ19a!T!A@wGWz>| z7P|23u?+9Tj`$3^!M*5L`f;>f-T?nT;QV`&vBNlY0khDCi_j20j&|6Fx%e;ag3&;} zgrF;C;Z*d9W}+dUjqY?l`qr#Lk7xsWgwJAq=8xVaW5=!N&fZ0D{}<@leTNQs4DFb~ zti_m(4%`=A*dX-zc(naRXoRL=G0w&Ud??hvfOWtByU4WW!9T-;6X+3S^Db%^%*T__ zh)fLS8JI_TA-aH7Sb#5~cjZI$^*ex$b3E8`aNNGrVB%kQhEy2Bv(N}!7Rocxvz?DF za2*MK?ZKVMcT)5|dY3Z!-Zj*P=)@h+x1>MXe<&Kc)2fKSuiscI{1KUicDw+6 z@24XFq8a>W#|`LFZ9;eUDt5q~Sc-?k^EM~PIrnGFQO6p6kXVt=w&^Cp7~Mq2%8LvH_#S6!V)xs!_ftd#&X~P^U1i9 zxo8BIq64l%Z}G<9OX%~r@C@9A4p>qhU%GNMBDGk8XQQE>g^qt4y6^|kjXjJFm_K@& z%!O3Eh=#7HCJt#8+Hia*Uy4TJ_vn$`jxKN!x{#%zekFP&PoNXNfi7e_y7S%WM!v)x z=8q1MaiGkhal>eZ#)*5P3+^Av!-J<| z8|uen-S7W3Wa?3IJvzWl^fKKX%8P>!peuhQl-HsQeG2Wr8T;T?Y=?>A@i$~Kj-xyY zyWm=M!|x9#{tmdGigf%M-Ps{DR2^&M`rc@Vf#@Y0hCV+Vop>rb&Sh91uSGBM4D?Ri zi5}U5XuH*+{>fV6?~Y%k!Y_)gXvp@V9lk-IA3-NdjEDzF!!s#2#TuN9ZeSU@uoakw z8_|V7i(cy2!t)*2kMh1G882Plsqw)5&<>}dmu3{Ykh4SiSLi^~(1p%K7cd7K;1;z1 z4s^jEq5VHWU(2t;^JCbZax!CNJYZk6V+}gc=->p*pgcJ|zXUTWUyTlUL#UsJE@%;Y z1k2HgtO!1a9>sce{8wV9L|e$X(;aBY_M!{fj}CMYJ@Z58LefUX12jhaWrcDPHl$pJ zPE?7FusXFl`{JD31b_Y68atDElTS}o=VVp2rR3*%62E(Oe>3nRMSml;4$l}WY8Uc9 zlK&0K&!N}Md`h$D@e_6T{!h8p43pf1DoQhB)(MroI^Tf#q~_td7x6Aq|5TU!qK17!ZEBq8Q`_>#Paa6i>D2ZM;|#)9q%_hM z)UP1@iPWBQ8`5#|pOVT+JxKMbYld@4Ey@4#xsuF~)QtrtO^=al7pm)}))eG+{V%0r z(qp9R(C26J>q&mMb@=}{se=Ut4F^-4M0K}R%fiA$S*oJ2q~&*%cautab|3akT~wG= z(K~effSO-EmDFvfu!q!x{D{ydk$SK&D=}ch#=={hZ>TQ6DLrjKMX#P4{@!zY)`okA H?M(k4VP$l| diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 9e1801a..76aaab2 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: $Id$\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2012-08-20 12:00 CET\n" +"PO-Revision-Date: 2012-09-17 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -755,6 +755,9 @@ msgstr "Kommentare" msgid "Add Comment" msgstr "Kommentar hinzufügen" +msgid "Subject" +msgstr "Thema" + msgid "Selection using: $targets" msgstr "Auswahl über: $targets" diff --git a/organize/comment/browser.py b/organize/comment/browser.py index 1a46402..2179c76 100644 --- a/organize/comment/browser.py +++ b/organize/comment/browser.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2008 Helmut Merz helmutm@cy55.de +# Copyright (c) 2012 Helmut Merz helmutm@cy55.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ """ Definition of view classes and other browser related stuff for comments. - -$Id$ """ from zope import interface, component @@ -52,6 +50,8 @@ class CommentsView(NodeView): @Lazy def allowed(self): + if self.isAnonymous: + return False return (self.virtualTargetObject is not None and self.globalOptions('organize.allowComments')) @@ -120,8 +120,8 @@ class CreateComment(EditObject): def update(self): form = self.request.form subject = form.get('subject') - text = form.get('text') - if not subject or not text or self.personId is None or self.object is None: + text = form.get('text') or u'' + if not subject or self.personId is None or self.object is None: return True #contentType = form.get('contentType') or 'text/restructured' rm = self.view.loopsRoot.getRecordManager() diff --git a/organize/comment/comment_macros.pt b/organize/comment/comment_macros.pt index 67c4b41..c512233 100644 --- a/organize/comment/comment_macros.pt +++ b/organize/comment/comment_macros.pt @@ -58,7 +58,7 @@