lib/CatalystX/Comments.pm lib/CatalystX/Comments/BaseForm.pm sql/ravlog_initial_data.sql t/comments.t @@ -2,11 +2,7 @@ package CatalystX::Comments::Form; use HTML::FormHandler::Moose; -extends 'HTML::FormHandler::Model::DBIC'; -with 'HTML::FormHandler::Render::Simple'; -#with 'HTML::FormHandler::Role::Captcha'; - -has '+item_class' => ( default => 'Comment' ); +extends 'CatalystX::Comments::BaseForm'; has_field 'name' => ( required => 1, @@ -22,18 +18,5 @@ has_field 'url' => ( label => 'Website', size => 25 ); -has_field 'comment' => ( - type => 'TextArea', - required => 1, - label => 'Body', - cols => 30, - rows => 10 -); - -has_field 'submit' => ( - type => 'Submit', - value => 'Save' -); - no HTML::FormHandler::Moose; 1; lib/CatalystX/Comments/Form.pm @@ -3,7 +3,7 @@ package RavLog::Controller::View; use Moose; BEGIN { extends 'Catalyst::Controller'; - with 'CatalystX::Comments::ControllerFormRole'; + with 'CatalystX::Comments'; } has 'comment' => ( is => 'rw' ); lib/RavLog/Controller/View.pm @@ -36,7 +36,7 @@ __PACKAGE__->add_columns( is_nullable => 1, size => 255, }, - "comment", + "body", { data_type => "text", default_value => undef, @@ -57,8 +57,8 @@ __PACKAGE__->add_columns( is_nullable => 1, size => undef, }, - "article_id", - { data_type => "integer", default_value => undef, is_nullable => 1, size => 4 }, + article_id => { data_type => "integer", default_value => undef, is_nullable => 1, size => 4 }, + user_id => { data_type => "integer", default_value => undef, is_nullable => 1, size => 4 }, ); use Text::Textile qw(textile); @@ -84,6 +84,7 @@ sub insert __PACKAGE__->set_primary_key("comment_id"); __PACKAGE__->belongs_to( 'article', 'RavLog::Schema::DB::Article', 'article_id' ); +__PACKAGE__->belongs_to( 'user', 'RavLog::Schema::DB::User', 'user_id' ); 1; lib/RavLog/Schema/DB/Comment.pm @@ -40,12 +40,17 @@ <li class="alt"> [% IF loop.index % 2 %] <div class="comment"> - [% ELSE %] + [% ELSE %] <div class="comment_alt"> - [% END %] - <h3><a title="[% comment.url %]" href="[% comment.url %]">[% comment.name %]</a></h3> + [% END %] + [% IF comment.user %] + [% SET url = comment.user.website; SET name = comment.user.username; %] + [% ELSE %] + [% SET url = comment.url; SET name = comment.name; %] + [% END %] + <h3><a title="[% url %]" href="[% url %]">[% name %]</a></h3> <small class="commentmetadata">Posted [% c.render_ravlog_date(comment.created_at) %]</small> - <p>[% comment.textilize('comment') %]</p> + <p>[% comment.textilize('body') %]</p> </div> </li> [% END %] root/templates/default/index.tt @@ -31,10 +31,11 @@ CREATE TABLE `comments` ( `name` character varying(255), `email` character varying(255), `url` character varying(255), - `comment` text, + `body` text, `created_at` timestamp DEFAULT now(), `remote_ip` character varying(32), `article_id` integer(4), + `user_id` integer(4), INDEX comments_idx_article_id (`article_id`), PRIMARY KEY (`comment_id`), CONSTRAINT `comments_fk_article_id` FOREIGN KEY (`article_id`) REFERENCES `articles` (`article_id`) ON DELETE CASCADE ON UPDATE CASCADE sql/ravlog_mysql.sql lib/CatalystX/Comments/ControllerFormRole.pm 2c88dd45416b4ad15a7ec6ca7309d72aa6181279 Zbigniew Lukasiak zby@zby.aster.net.pl http://github.com/gshank/ravlog/commit/8b7ec1493324212cde91927c15fc54cd2c9db25d 8b7ec1493324212cde91927c15fc54cd2c9db25d 2009-06-21T11:23:48-07:00 2009-06-21T11:23:48-07:00 different comment form for logged in users 9eec2e8e685b4bcf86cb1e7fedcb74bc13473b2a Zbigniew Lukasiak zby@zby.aster.net.pl