Merge lp:~fallaby/mvhub/display_agency_home_page_and_exit into lp:mvhub

[frank allaby]

Submitted feb 11 2011

[lp:~fallaby/mvhub/display_agency_home_page_and_exit]

547. By frank allaby on 2011-02-11

refer to bottom

[Dan MacNeil (omacneil)]

app-mvhub/doc/cheat_sheets/bzr_workflow.txt'

..shoudln't be edited

[Dan MacNeil (omacneil)]

This branch does two different unrelated things:

1) a test for MVHub::AgencyFieldDefs::get_agency_field_definitions_href()
2) improves MVHub::Common::display_agency_home_page_and_exit()

 which makes it a little bit confusing.

Given both the changes are improvements and simple, I'll approve and merge if checklist change is reverted

[Dan MacNeil (omacneil)]

sorry cheat sheet change

[lp:~fallaby/mvhub/display_agency_home_page_and_exit]

548. By frank allaby on 2011-05-05

cheat sheet reversion to comply with comments from Dan

549. By frank allaby on 2011-05-05

changes from /trunk

550. By frank allaby on 2011-05-06

correct link cheatsheet

551. By frank allaby on 2011-05-06

neatening up

=== modified file 'app-mvhub/doc/cheat_sheets/bzr_workflow.txt'
--- app-mvhub/doc/cheat_sheets/bzr_workflow.txt	2011-01-26 17:11:06 +0000
+++ app-mvhub/doc/cheat_sheets/bzr_workflow.txt	2011-05-06 13:27:45 +0000
@@ -60,7 +60,7 @@
                 bzr commit -m "merged trunk"
 
                 # apply database schema changes
-                mv_update_development               
+                mv_update_development	               
                 mv_prove -r app-mvhub/t lib-mvhub/t
                     
 # PROCEDURE     Make A Merge Request
@@ -100,7 +100,7 @@
           bzr merge lp:mvhub/trunk
           
           # run tests 
-          mv_prove -r app-mvhub/t lib-mvhub/t
+          mv_prove -r app-mvhub/t lib-mvhub/t 
           
           # Assuming no conflicts,test failures or other problems
           bzr commit -m "merged trunk"

=== modified file 'lib-mvhub/lib/MVHub/Common.pm'
--- lib-mvhub/lib/MVHub/Common.pm	2010-10-16 00:29:43 +0000
+++ lib-mvhub/lib/MVHub/Common.pm	2011-05-06 13:27:45 +0000
@@ -53,6 +53,8 @@
 use MVHub::Utils::DB;
 use MVHub::Page;
 
+use Params::Validate;
+
 # Our specially doctored version of CGI::FormBuilder:
 use CGI::FormBuilder 2004.0123456789;
 use MVHub::Page;
@@ -149,12 +151,18 @@
 # This is semi-hackish right now, until we move over entirely to
 # CGI::Application
 sub display_agency_home_page_and_exit {
+
+    Params::Validate::validate(
+        @_,
+        {   agency_id    => 1,    # mandatory
+            init_session => 0,    # optional
+            message      => 0
+        }
+    );
     my %args         = @_;
-    my $agency_id    = $args{agency_id};       # required
-    my $init_session = $args{init_session};    # optional
-    my $message      = $args{message};         # optional
-    croak("Missing agency_id argument")
-        if ( !defined $agency_id or $agency_id eq "" );
+    my $agency_id    = $args{agency_id};
+    my $init_session = $args{init_session};
+    my $message      = $args{message};
 
     my $cgi = new CGI("");
     my $cookie;

=== modified file 'lib-mvhub/t/AgencyFieldDefs/get_agency_field_definitions_href.t'
--- lib-mvhub/t/AgencyFieldDefs/get_agency_field_definitions_href.t	2011-02-01 16:05:08 +0000
+++ lib-mvhub/t/AgencyFieldDefs/get_agency_field_definitions_href.t	2011-05-06 13:27:45 +0000
@@ -2,7 +2,6 @@
 use strict;
 use warnings;
 
-# EDIT
 use Test::More tests => 1 + 1;    # +1 for NoWarnings
 use Test::NoWarnings;
 use Test::More;