Commit Graph

502 Commits

Author SHA1 Message Date
Izak Burger 4d1e7b5806 don't ignore user_notification checkbox. 2012-09-17 23:51:15 +02:00
Patrick Gerken 9146aa8025 Don't use reindexObject from catalog, but from the object
collective.indexing assumes that reindexObject from catalog is not
an official api method, therefor it does not patch it.
This results in missing updates if plone.app.discussion is used
together with solr, which uses collective.indexing
2012-08-22 18:00:27 +02:00
Timo Stollenwerk 702f7e1f1d Make 'text/plain' the default mime type for comments and make sure the default type is set properly when creating a new comment. 2012-07-12 16:01:07 +02:00
Timo Stollenwerk ac9d4f9584 Rename the id of the text widgets because there can be css-id clashes with
the text field of documents when using TinyMCE in overlays or multiple
instances of TinyMCE on a single page.
2012-07-12 15:49:19 +02:00
Timo Stollenwerk 0535e659ff Refactor the comment creator/author_name to comply with the Plone core convention to store the username on the creator attribute and not the fullname. 2012-07-12 15:39:27 +02:00
Timo Stollenwerk 19685db96b Merge pull request #9 from Goldmund-Wyldebeast-Wunderliebe/master
no more recursive came_from redirection after logged_in
2012-07-12 03:35:33 -07:00
Timo Stollenwerk 0e587a7d85 Support for Dexterity added. 2012-06-30 10:59:49 +02:00
Paul J Stevens 53428fe5f6 total_comments only counts published comments
Also migrate workflow state during migration.
2012-06-13 11:17:22 +00:00
Gaudenz Steinlin 4e0bf9f25e Fix JS comment deletion
If the comment tree had just one top level comment the whole tree was
removed by the JS code if just one comment in the tree was deleted.
These comments were (correctly) not removed from the ZODB.
2012-05-29 13:26:05 +02:00
Hanno Schlichting 1b0ba3c0b0 No longer depend on zope.app packages. 2012-05-18 18:19:12 -04:00
Huub Bouma c9848bebfe no more recursive came_from redirection after logged_in 2012-04-12 13:06:05 +02:00
Timo Stollenwerk ebb39b4994 No need to define portal_membership tool twice. 2012-03-19 16:32:33 +01:00
Timo Stollenwerk 58663fb492 Warning message added to discussion control panel that shows up if there are unmigrated comments. 2012-03-15 20:00:08 +01:00
Timo Stollenwerk c76ef0523e Merge commit 877f2d3e84 which has been accidentially purged. 2012-03-15 19:06:23 +01:00
Timo Stollenwerk 910f75aa7e Make comments and controlpanel views more robust, so they don't break if no workflow is assigned to the 'Discussion Item' content type. 2012-03-15 13:06:00 +01:00
Elizabeth Leddy 877f2d3e84 fix url redirect for content types that must have /view in url to view contents 2012-03-14 15:01:17 -07:00
Timo Stollenwerk 80d70bbf08 Whitespace 2012-01-25 15:57:17 +01:00
tisto c14091c734 Pep8 2012-01-14 08:00:40 +01:00
tisto 11e101f7d7 Pep8 2012-01-14 07:47:07 +01:00
tisto 2dc5393ff2 Pep8 2012-01-14 07:35:59 +01:00
tisto 2d4f7fd665 Pep8 2012-01-14 07:30:43 +01:00
tisto 0558a9b739 Pep8 2012-01-14 07:26:01 +01:00
tisto a3883d7e7b Pep8 2012-01-14 07:13:39 +01:00
Timo Stollenwerk cce409a729 Pep8 2012-01-13 14:40:26 +01:00
Timo Stollenwerk 07cde3ca7b Pep8 2012-01-13 10:16:01 +01:00
Timo Stollenwerk 5911bae362 whitespace.
svn path=/plone.app.discussion/trunk/; revision=51798
2011-08-26 11:13:19 +00:00
Timo Stollenwerk 87700f3810 Markdown syntax added to possible comment text transforms.
svn path=/plone.app.discussion/trunk/; revision=51530
2011-08-05 10:08:39 +00:00
Timo Stollenwerk dbda349768 Automatically reload batch moderation page if no comments are left. This refs #11298.
svn path=/plone.app.discussion/trunk/; revision=51274
2011-07-15 17:29:29 +00:00
Timo Stollenwerk 637ac334ac Remove debug print.
svn path=/plone.app.discussion/trunk/; revision=51259
2011-07-15 08:25:34 +00:00
Timo Stollenwerk 160022b146 Another fix for http://dev.plone.org/plone/ticket/11486. r51246 fixed Chrome but broke Safari. This fix has been tested in Fx, Chrome, Safari and IE 9.
svn path=/plone.app.discussion/trunk/; revision=51258
2011-07-15 08:23:08 +00:00
Timo Stollenwerk c2ff87a778 Fix discussion control panel submit. This fixes Refs #11486.
svn path=/plone.app.discussion/trunk/; revision=51246
2011-07-14 07:09:58 +00:00
Timo Stollenwerk 98bcc19d5c Do not render/update the comment form in CommentViewlets if commenting is disabled, since this slows down the page rendering. This fixes http://dev.plone.org/plone/ticket/11930 #11930
svn path=/plone.app.discussion/trunk/; revision=50489
2011-06-16 10:59:25 +00:00
WouterVH f149f0f8dd - Enable the left-menu on the configlet, to be more consistent with all other configlets.
Related to https://dev.plone.org/plone/ticket/11737
  [WouterVH]

svn path=/plone.app.discussion/trunk/; revision=50095
2011-05-28 22:02:33 +00:00
Timo Stollenwerk a7f61eb4d3 Refactor/clean up the handleComment method.
svn path=/plone.app.discussion/trunk/; revision=50069
2011-05-27 13:47:15 +00:00
Timo Stollenwerk 1ea5f0cdb4 Make handleComment method store comment attributes from form extenders. This allows us to extend the comment form with external add-ons.
svn path=/plone.app.discussion/trunk/; revision=50059
2011-05-26 21:37:37 +00:00
Erico Andrei 9ac35de362 Tests expect a False to be returned from the funcion
svn path=/plone.app.discussion/trunk/; revision=49137
2011-04-27 19:33:00 +00:00
Erico Andrei 1a751b495f Unless Discussion Item has an workflow, moderation is not enabled
svn path=/plone.app.discussion/trunk/; revision=49135
2011-04-27 17:41:07 +00:00
Timo Stollenwerk e75685d5c0 Add links to delete/approve a comment in the moderator notification email.
Remove the unnecessary workflow_action parameter from the PublishComments request.

svn path=/plone.app.discussion/trunk/; revision=49045
2011-04-22 17:09:09 +00:00
Timo Stollenwerk f551e30849 Replace tabs with whitespace in moderation.js.
svn path=/plone.app.discussion/trunk/; revision=49036
2011-04-22 15:43:58 +00:00
Timo Stollenwerk c66e243a86 Make sure the email settings in the control panel are disabled when commenting is disabled globally;
Enable/disable moderator_email setting dynamically as mail settings or discussion settings change.

svn path=/plone.app.discussion/trunk/; revision=49035
2011-04-22 15:41:45 +00:00
Timo Stollenwerk b84211ddf0 Remove ImportError exceptions for Plone < 4.1 code and plone.z3cform < 0.6.0.
svn path=/plone.app.discussion/trunk/; revision=49033
2011-04-22 14:59:59 +00:00
Hanno Schlichting 4110b41ae6 Even simpler code :)
svn path=/plone.app.discussion/trunk/; revision=48886
2011-04-15 16:56:17 +00:00
Hanno Schlichting b4c5d287dd Style ;)
svn path=/plone.app.discussion/trunk/; revision=48885
2011-04-15 16:47:57 +00:00
Hanno Schlichting f2e47227f9 Fix old-style exception raising
svn path=/plone.app.discussion/trunk/; revision=48884
2011-04-15 16:44:16 +00:00
Ross Patterson 3708429a37 Move some policy out of the conversation storage adapter into a view,
specifically "enabled()".  Prevents having to replace/migrate
persistent objects to change policy which really only concerns the
context and possibly the request, not the conversation storage. Fixes
#11372.

svn path=/plone.app.discussion/trunk/; revision=48849
2011-04-15 04:29:46 +00:00
Vincent Fretin ab5c728448 Fixed i18n of the "Commenting has been disabled." message.
svn path=/plone.app.discussion/trunk/; revision=48694
2011-04-10 20:28:21 +00:00
David Glick 636bca745c merge r47140, r47290, r47579 from davisagli-features: fix timezone handling when migrating legacy comments and when indexing
svn path=/plone.app.discussion/trunk/; revision=48358
2011-04-02 21:26:36 +00:00
David Glick eb004aab44 merge r46437 and r46946 from davisagli-features: respect the per-comment mime_type setting, and use the old cooked text/html from legacy comments when migrating
svn path=/plone.app.discussion/trunk/; revision=48356
2011-04-02 19:51:37 +00:00
David Glick bf5946367a merge r46436 from davisagli-features: make it possible to specify a callback filter for the migration
svn path=/plone.app.discussion/trunk/; revision=48354
2011-04-02 19:33:10 +00:00
David Glick feb1759958 fix incorrect parenthesization
svn path=/plone.app.discussion/trunk/; revision=48240
2011-03-26 05:04:22 +00:00
Thomas Desvenain 7c2a815fdb Fixed internationalization issues.
svn path=/plone.app.discussion/trunk/; revision=48110
2011-03-17 16:15:40 +00:00
Timo Stollenwerk bf96d0082f Remove "Plone 3 only" code; Do not monkey patch the BAD_TYPES vocabulary or plone.app.vocabularies anymore.
svn path=/plone.app.discussion/trunk/; revision=47311
2011-02-08 09:28:51 +00:00
Timo Stollenwerk 0c435dc9ca Check if the current user has configured an e-mail address for the email notification option. Refs #11428
svn path=/plone.app.discussion/trunk/; revision=47069
2011-01-26 08:15:14 +00:00
Timo Stollenwerk fb0ca6c795 Replace tabs with whitespace.
svn path=/plone.app.discussion/trunk/; revision=46974
2011-01-20 20:04:38 +00:00
Timo Stollenwerk 9cc32a76a4 Enable ajaxify comment deletion again ([thomasdesvenain]). This has been disabled in 1.0b12 because of problems with Plone 3.
svn path=/plone.app.discussion/trunk/; revision=46970
2011-01-20 19:38:26 +00:00
Timo Stollenwerk 75cde25b6f Always show existing comments, even if commenting is disabled.
svn path=/plone.app.discussion/trunk/; revision=46785
2011-01-07 15:27:17 +00:00
Timo Stollenwerk 61e231b336 Fix CSS for commenter images with a width of more than 2.5em. This fixes http://dev.plone.org/plone/ticket/11391. Refs #11391
svn path=/plone.app.discussion/trunk/; revision=46783
2011-01-07 10:27:13 +00:00
Timo Stollenwerk c438743a3b Show a 'Comments are moderated.' message next to the comment form if comments are moderated.
svn path=/plone.app.discussion/trunk/; revision=46782
2011-01-07 10:20:24 +00:00
Maurits van Rees a2a17085a3 Nuke trailing white space
svn path=/plone.app.discussion/trunk/; revision=46366
2010-12-15 23:52:56 +00:00
Maurits van Rees 9eb172023a No tabs in zcml please
svn path=/plone.app.discussion/trunk/; revision=46364
2010-12-15 22:59:24 +00:00
Timo Stollenwerk 4c4cd9e44d Replace XXX with todo.
svn path=/plone.app.discussion/trunk/; revision=46263
2010-12-12 08:14:48 +00:00
Timo Stollenwerk 0485398de0 whitespace, make jslint happy.
svn path=/plone.app.discussion/trunk/; revision=46262
2010-12-12 08:13:03 +00:00
Timo Stollenwerk be78fbe300 There is no need to enable the "enable moderation" checkbox dynamically, except when commenting is disabled/enabled globally.
svn path=/plone.app.discussion/trunk/; revision=46261
2010-12-12 07:35:43 +00:00
Timo Stollenwerk 08857df7a9 Fix cancel button on edit view when using Dexterity types. This fixes http://dev.plone.org/plone/ticket/11338. Refs #11338
svn path=/plone.app.discussion/trunk/; revision=46254
2010-12-11 21:33:43 +00:00
Timo Stollenwerk f2f97c5b38 Change the comment workflow setting in the discussion control panel if the setting is changed in the types control panel; show warning message and disable the setting if a custom comment workflow is enabled.
svn path=/plone.app.discussion/trunk/; revision=46253
2010-12-11 21:30:18 +00:00
Timo Stollenwerk 0475376ed0 "Enable comment moderation" setting added to the discussion control panel. Just a proof of concept so far. Not fully implemented yet. No tests.
svn path=/plone.app.discussion/trunk/; revision=46249
2010-12-11 17:18:14 +00:00
Timo Stollenwerk 7e279d3ad3 Make sure the handleComment method checks for the 'Reply to item' permission when adding a comment.
svn path=/plone.app.discussion/trunk/; revision=46212
2010-12-09 08:11:41 +00:00
Timo Stollenwerk c8e78449a2 Make the mail-setting warning message show up in the discussion control panel.
svn path=/plone.app.discussion/trunk/; revision=46211
2010-12-09 08:07:15 +00:00
Timo Stollenwerk 797ed40852 Link directly to the "Discussion Item" types control panel in the moderation view.
svn path=/plone.app.discussion/trunk/; revision=46207
2010-12-08 17:45:58 +00:00
Timo Stollenwerk 583b25530e Show "moderate comments" link in the admin panel only if a moderation workflow is enabled for comments.
svn path=/plone.app.discussion/trunk/; revision=46206
2010-12-08 17:45:11 +00:00
Timo Stollenwerk 04a0669731 Remove the grey background from disabled settings.
svn path=/plone.app.discussion/trunk/; revision=46142
2010-12-05 14:10:21 +00:00
Timo Stollenwerk bbd44b7b95 workflow setting added to control panel config string.
svn path=/plone.app.discussion/trunk/; revision=46091
2010-12-02 23:20:10 +00:00
Timo Stollenwerk ffde4b423d Do not allow to change the mail settings in the discussion control panel, if there is no valid mail setup. Refactor js code to use class settings of #content.
svn path=/plone.app.discussion/trunk/; revision=46090
2010-12-02 23:02:00 +00:00
Timo Stollenwerk fbd7eb2bbc Do not allow to change the mail settings in the discussion control panel, if there is no valid mail setup.
svn path=/plone.app.discussion/trunk/; revision=46089
2010-12-02 21:07:58 +00:00
Timo Stollenwerk 1b36f99a7a make jslint happy; disable settings onload;
svn path=/plone.app.discussion/trunk/; revision=46088
2010-12-02 19:49:49 +00:00
Timo Stollenwerk 2a7a65293e disable form fields when disabling the fields.
svn path=/plone.app.discussion/trunk/; revision=46087
2010-12-02 19:09:16 +00:00
Timo Stollenwerk f97c17e62a Factor out enable/disable settings function.
svn path=/plone.app.discussion/trunk/; revision=46086
2010-12-02 18:50:21 +00:00
Timo Stollenwerk ffcc29a401 Override the default plone.app.registry controlpanel template; JS file for the controlpanel added. Disable all commenting options in the discussion control panel when comments are disabled globally.
svn path=/plone.app.discussion/trunk/; revision=46085
2010-12-02 18:15:47 +00:00
Timo Stollenwerk c311a4f88d Check for the 'review comments' permission instead of 'manage' to decide if the user should see a 'this comment is pending' message.
svn path=/plone.app.discussion/trunk/; revision=46050
2010-12-01 06:34:05 +00:00
Timo Stollenwerk 13772c6e5b Redirect back to the discussion control panel when the discussion control panel form is submitted.
svn path=/plone.app.discussion/trunk/; revision=46040
2010-11-30 09:06:46 +00:00
Timo Stollenwerk 824ed1e94a Fix document_byline bottom margin if commenter images are disabled.
svn path=/plone.app.discussion/trunk/; revision=46037
2010-11-30 07:33:22 +00:00
Timo Stollenwerk 0c94707743 Dynamically show the comment formatting message dependent on the text transform setting.
svn path=/plone.app.discussion/trunk/; revision=46035
2010-11-29 22:42:20 +00:00
David Glick 4c31afeac2 fix comparison of string to integer which broke 'check all'
svn path=/plone.app.discussion/trunk/; revision=45926
2010-11-23 18:53:38 +00:00
Timo Stollenwerk 5b788d1156 Merge 'Convert anonymous-supplied name to unicode as done for authenticated members.' from jarn-unicode branch.
svn path=/plone.app.discussion/trunk/; revision=45662
2010-11-08 17:09:26 +00:00
Timo Stollenwerk 501cee78e2 ".comment" and ".replyTreeLevel0" are both CSS classes of the comment div. Fix for Plone 3 only.
svn path=/plone.app.discussion/trunk/; revision=45189
2010-11-04 14:50:30 +00:00
Timo Stollenwerk 823ada7491 Remove AJAX comment deletion binding. This function relies on the nextUntil() selector introduced by jQuery 1.4 and therefore breaks in Plone 3 (that currently uses jQuery 1.3.2).
svn path=/plone.app.discussion/trunk/; revision=45188
2010-11-04 14:42:32 +00:00
Timo Stollenwerk b68da9925b Use parseInt with second param to make jslint happy.
svn path=/plone.app.discussion/trunk/; revision=45187
2010-11-04 14:37:18 +00:00
Timo Stollenwerk b95707ac52 Re-add the CommentsViewlet can_manage method. This method has been removed in version 1.0b9 and added again in 1.0b11 because we don't want to change the API in beta releases.
svn path=/plone.app.discussion/trunk/; revision=45110
2010-11-03 11:26:18 +00:00
Timo Stollenwerk cc96acb50a Ajaxify comment deletion and approval. thanks thomasdesvenain!
svn path=/plone.app.discussion/trunk/; revision=40984
2010-10-30 17:32:31 +00:00
Timo Stollenwerk 82afd3ef15 New feature: As a logged-in user, I can enable/disable email notification of additional comments on this content object.
svn path=/plone.app.discussion/trunk/; revision=40949
2010-10-30 15:02:05 +00:00
Timo Stollenwerk 81dcdeaea3 Disable the plone.app.registry check on schema elements, so no error is raised on upgrades. This fixes https://dev.plone.org/plone/ticket/11195. Refs #11195
svn path=/plone.app.discussion/trunk/; revision=40868
2010-10-29 10:43:46 +00:00
Timo Stollenwerk f6b7ef1bcb Remove the too generic id attribute of the comment form.
svn path=/plone.app.discussion/trunk/; revision=40858
2010-10-28 10:30:10 +00:00
Timo Stollenwerk 777e687169 Rename the id of the comment form from "form" to "comment-form".
svn path=/plone.app.discussion/trunk/; revision=40857
2010-10-28 09:45:34 +00:00
Timo Stollenwerk 22e4189c37 Revert revisions r40851 to r40853, they should have gone into the ajax-ui branch.
svn path=/plone.app.discussion/trunk/; revision=40856
2010-10-28 09:39:00 +00:00
Timo Stollenwerk 14e2600a79 Make ajax call for delete comment button work for comment replies.
svn path=/plone.app.discussion/trunk/; revision=40853
2010-10-27 16:10:04 +00:00
Timo Stollenwerk 926e4f6b8e Integrate Denys ajax ui code.
svn path=/plone.app.discussion/trunk/; revision=40852
2010-10-27 14:44:52 +00:00
Timo Stollenwerk 79f4481722 Use "#comment-form" as id for the comment form instead of "#form" which is too generic.
svn path=/plone.app.discussion/trunk/; revision=40851
2010-10-27 14:44:06 +00:00
Hanno Schlichting aa8a1ea934 Fixed handling of non-ascii member data, like fullname and email.
svn path=/plone.app.discussion/trunk/; revision=40789
2010-10-22 10:14:07 +00:00
Radim Novotny 18e92f7a85 - Fixed "global name 'WrongCaptchaCode' is not defined" if norobots captcha,
but no other validation package is installed.

svn path=/plone.app.discussion/trunk/; revision=40574
2010-10-09 11:13:28 +00:00
Timo Stollenwerk 6e9bb4a9cd Check the review_state to decide if moderation is enabled. If the current comment workflow implements a 'pending' state, moderation is enabled. Refs #11184.
svn path=/plone.app.discussion/trunk/; revision=40569
2010-10-08 10:22:40 +00:00