X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Manual.git;a=blobdiff_plain;f=lib%2FCatalyst%2FManual%2FTutorial%2FAdvancedCRUD%2FFormFu.pod;h=03414614046ece1f2e8adfd2eed86d3e0ef065fb;hp=90d6ea5662c4b7269b0fd719906ed35198ccd755;hb=faa6f5bc58eb607bc9737b290f2d84847d499d0c;hpb=8a7951ae5e56afc0ad0aa0f5a898d7dfd0bd9fd9

diff --git a/lib/Catalyst/Manual/Tutorial/AdvancedCRUD/FormFu.pod b/lib/Catalyst/Manual/Tutorial/AdvancedCRUD/FormFu.pod
index 90d6ea5..0341461 100644
--- a/lib/Catalyst/Manual/Tutorial/AdvancedCRUD/FormFu.pod
+++ b/lib/Catalyst/Manual/Tutorial/AdvancedCRUD/FormFu.pod
@@ -1,13 +1,11 @@
 =head1 NAME
 
-
-
-Catalyst::Manual::Tutorial::AdvancedCRUD::FormFu - Catalyst Tutorial - Part 9: Advanced CRUD - FormFu
+Catalyst::Manual::Tutorial::AdvancedCRUD::FormFu - Catalyst Tutorial - Chapter 9: Advanced CRUD - FormFu
 
 
 =head1 OVERVIEW
 
-This is B<Part 9 of 10> for the Catalyst tutorial.
+This is B<Chapter 9 of 10> for the Catalyst tutorial.
 
 L<Tutorial Overview|Catalyst::Manual::Tutorial>
 
@@ -71,48 +69,32 @@ L<HTML::FormFu|HTML::FormFu>.
 
 =head1 Install C<HTML::FormFu>
 
-If you are following along in Ubuntu, it turns out that C<HTML::FormFu> 
-is not yet available as a package at the time this was written.  To 
-install it with a combination of C<apt-get> packages and traditional 
-CPAN modules, first use C<apt-get> to install most of the modules 
-required by C<HTML::FormFu>:
-
-    sudo apt-get install libtest-nowarnings-perl libdatetime-format-builder-perl \
-    libdatetime-format-strptime-perl libdatetime-locale-perl \
-    libhtml-tokeparser-simple-perl liblist-moreutils-perl \
-    libregexp-copy-perl libregexp-common-perl libyaml-syck-perl libparams-util-perl \
-    libcrypt-des-perl libcaptcha-recaptcha-perl libcrypt-cbc-perl \
-    libreadonly-xs-perl libmoose-perl libregexp-assemble-perl
-    
-    ...
-    
-    sudo apt-get clean
+If you are following along in Debian 5, it turns out that some of the 
+modules we need are not yet available as Debian packages at the time 
+this was written.  To install it with a combination of Debian packages 
+and traditional CPAN modules, first use C<aptitude> to install most of 
+the modules:
 
-Then use the following command to install directly from CPAN the modules 
-that aren't available as Ubuntu/Debian packages via C<apt-get>:
+we need to install the
+L<HTML::FormFu|HTML::FormFu> package: 
 
-    sudo cpan File::ShareDir Task::Weaken Config::Any Test::Harness Test::Aggregate \
-    boolean Test::MockTime DateTime::Format::Natural HTML::FormFu \
-    Catalyst::Component::InstancePerContext Catalyst::Controller::HTML::FormFu \
-    HTML::FormFu::Model::DBIC
-    
-    ...
-    
-    Is it OK to try to connect to the Internet? [yes] yes
-    
+    sudo aptitude -y install libhtml-formfu-perl libmoose-perl \
+        libregexp-assemble-perl libhtml-formfu-model-dbic-perl
+        
     ...
     
+    sudo aptitude clean
+
+Then use the following command to install directly from CPAN the modules 
+that aren't available as Debian packages:
 
-B<Note:> If you are following along with the Ubuntu LiveCD, you might 
-want to make sure you still have adequate free disk space in the root 
-partition with the C<df> command.  You can free up some space with 
-C<rm -rf /root/.cpan/*>.
+    sudo cpan Catalyst::Component::InstancePerContext Catalyst::Controller::HTML::FormFu
 
 
 =head1 C<HTML::FormFu> FORM CREATION
 
 This section looks at how L<HTML::FormFu|HTML::FormFu> can be used to 
-add additional functionality to the manually created form from Part 4.
+add additional functionality to the manually created form from Chapter 4.
 
 
 =head2 Inherit From C<Catalyst::Controller::HTML::FormFu>
@@ -139,7 +121,7 @@ following method:
     
     =cut
     
-    sub formfu_create :Local :FormConfig {
+    sub formfu_create :Chained('base') :PathPart('formfu_create') :Args(0) :FormConfig {
         my ($self, $c) = @_;
     
         # Get the form that the :FormConfig attribute saved in the stash
@@ -160,10 +142,10 @@ following method:
             $c->detach;
         } else {
             # Get the authors from the DB
-            my @authorObjs = $c->model("DB::Authors")->all();
+            my @author_objs = $c->model("DB::Authors")->all();
             # Create an array of arrayrefs where each arrayref is an author
             my @authors;
-            foreach (sort {$a->last_name cmp $b->last_name} @authorObjs) {
+            foreach (sort {$a->last_name cmp $b->last_name} @author_objs) {
                 push(@authors, [$_->id, $_->last_name]);
             }
             # Get the select added by the config file
@@ -233,6 +215,7 @@ this document for a more foolproof config format.
 Edit C<root/static/css/main.css> and add the following lines to the bottom of
 the file:
 
+    ...
     input {
         display: block;
     }
@@ -268,6 +251,7 @@ Open C<root/src/books/formfu_create.tt2> in your editor and enter the following:
 Open C<root/src/books/list.tt2> in your editor and add the following to
 the bottom of the existing file:
 
+    ...
     <p>
       HTML::FormFu:
       <a href="[% c.uri_for(c.controller.action_for('formfu_create')) %]">Create</a>
@@ -464,11 +448,12 @@ bottom:
     
     =cut
     
-    sub formfu_edit :Local :FormConfig('books/formfu_create.yml') {
-        my ($self, $c, $id) = @_;
+    sub formfu_edit :Chained('object') :PathPart('formfu_edit') :Args(0) 
+            :FormConfig('books/formfu_create.yml') {
+        my ($self, $c) = @_;
     
-        # Get the specified book
-        my $book = $c->model('DB::Books')->find($id);
+        # Get the specified book already saved by the 'object' method
+        my $book = $c->stash->{object};
     
         # Make sure we were able to get a book
         unless ($book) {
@@ -493,10 +478,10 @@ bottom:
             $c->detach;
         } else {
             # Get the authors from the DB
-            my @authorObjs = $c->model("DB::Authors")->all();
+            my @author_objs = $c->model("DB::Authors")->all();
             # Create an array of arrayrefs where each arrayref is an author
             my @authors;
-            foreach (sort {$a->last_name cmp $b->last_name} @authorObjs) {
+            foreach (sort {$a->last_name cmp $b->last_name} @author_objs) {
                 push(@authors, [$_->id, $_->last_name]);
             }
             # Get the select added by the config file
@@ -519,17 +504,25 @@ the common code in separate methods).  The main differences are:
 
 =item *
 
-We accept C<$id> as an argument via the URL.
+We have to manually specify the name of the FormFu .yml file as an 
+argument to C<:FormConfig> because the name can no longer be 
+automatically deduced from the name of our action/method (by default,
+FormFu would look for a file named C<books/formfu_edit.yml>).
 
 =item *
 
-We use C<$id> to look up the existing book from the database.
+We load the book object from the stash (found using the $id passed to 
+the Chained object method)
 
 =item *
 
-We make sure the C<$id> and book lookup returned a valid book.  If not, 
-we set the error message and return to the book list.
+We use C<$id> to look up the existing book from the database.
+
+=item *
 
+We make sure the book lookup returned a valid book.  If not, we set 
+the error message and return to the book list.
+ 
 =item *
 
 If the form has been submitted and passes validation, we skip creating a 
@@ -553,9 +546,9 @@ following:
     ...
     <td>
       [% # Add a link to delete a book %]
-      <a href="[% c.uri_for(c.controller.action_for('delete', [book.id])) %]">Delete</a>
+      <a href="[% c.uri_for(c.controller.action_for('delete'), [book.id]) %]">Delete</a>
       [% # Add a link to edit a book %]
-      <a href="[% c.uri_for(c.controller.action_for('formfu_edit', [book.id])) %]">Edit</a>
+      <a href="[% c.uri_for(c.controller.action_for('formfu_edit'), [book.id]) %]">Edit</a>
     </td>
     ...
 
@@ -588,7 +581,7 @@ tweaking the example application; some things you might want to do:
 
 =item *
 
-Add an appropriate ACL to the new Edit function.
+Add an appropriate authorization check to the new Edit function.
 
 =item *