Changeset 431

Timestamp:

05/21/08 01:49:07 (22 months ago)

Author:

eevee

Message:

I give up; removing all the FormFu? code, as it doesn't work at all how I need it to. (#302)
If it's ever fixed, well, that's why we have version control. If not, I will probably expand Vee::Form into a real form processing module.

Location:

veekun/trunk

Files:

• forms (deleted)
• lib/Vee/Controller/Dex/Utils.pm (modified) (3 diffs)
• lib/Vee/Form (deleted)
• templates/dex/utils/breeding_chains.tt (modified) (1 diff)

veekun/trunk/lib/Vee/Controller/Dex/Utils.pm

@@ -3 +3 @@
 use strict;
 use warnings;
-use base 'Catalyst::Controller::HTML::FormFu';
+use base 'Catalyst::Controller';
 
 use List::MoreUtils qw/first_index last_index/;
+
 use Vee::Dex;
 use Vee::Form;
@@ -230 +231 @@
 }
 
+our $breeding_chains_fields = {
+    pokemon     => { type => 'text', class => 'js-dexsuggest-pokemon', },
+    move        => { type => 'text', count => 4, class => 'js-dexsuggest-move', },
+};
+
 sub breeding_chains
     : Path('calculators/breeding_chains')
     : Args(0)
-    : FormConfig('dex/utils/breeding_chains.yml')
 {
     my ($self, $c) = @_;
     my $s    = $c->stash;
-    my $form = $s->{form};
-    $s->{template} = 'dex/utils/breeding_chains.tt';
+    my $p    = $c->req->params;
+
+    my $form = $s->{form} = Vee::Form->new(
+        id => 'breeding_chains',
+        fields => $breeding_chains_fields,
+        params => $p,
+    );
+    $s->{template}   = 'dex/utils/breeding_chains.tt';
     $s->{page_title} = 'Breeding Chains';
 
-    if (not $form->submitted or $form->has_errors) {
+    if (not $form->submitted) {
         return;
     }
 
-    # XXX do the retrievals in Inflator code
-    my $pokemon = $c->model('DBIC::Pokemon')->find($form->param_value('pokemon'));
-    my @moves   = map { $c->model('DBIC::Moves')->find($_) } $form->param_list('move');
+    my $pokemon = $c->model('DBIC::Pokemon')->search({ name => $p->{ pokemon } })->first;
+    my @moves   = $c->model('DBIC::Moves'  )->search({ name => $p->{ move    } })->all;
 
     # XXX
@@ -253 +263 @@
 
     ### Misc error handling
+
+    if (not $pokemon) {
+        $s->{error_msg}
+            = 'No such Pokemon ' . $c->vee_cleanse($p->{pokemon}) . '.';
+        return;
+    }
 
     if ($pokemon->breeding_code == 255) {

veekun/trunk/templates/dex/utils/breeding_chains.tt

@@ -2 +2 @@
 
 <h1>Breeding Chain Finder</h1>
-[% form.start %]
+<form action="" method="get">
 <dl class="compact">
     <dt>Pok&eacute;mon</dt>
-    <dd>[% form.get_field(name => 'pokemon') %]</dd>
-    <dt>Move</dt>
-    <dd>[% form.get_field(name => 'move') %]</dd>
+    <dd>[% form.get_tag('pokemon') %]</dd>
+    <dt>Moves</dt>
+    <dd>[% form.get_tag('move') %]</dd>
 </dl>
 <p> <input type="submit" value="Find chains"/> <input type="reset" value="Reset form"/> </p>
-[% form.end %]
-[% RETURN IF NOT form.submitted OR form.has_errors %]
+</form>
+[% RETURN IF NOT form.submitted %]
 
 <h1>Chains</h1>