mvhub-dev team mailing list archive

[Dan MacNeil <dan@xxxxxxxxxx>]

Dan MacNeil has proposed merging lp:~omacneil/mvhub/short_reports_link into lp:mvhub.

Requested reviews:
  MVHub devs with commit rights (mvhub-commit)


see commit msg
-- 
https://code.launchpad.net/~omacneil/mvhub/short_reports_link/+merge/30152
Your team MVHub Developers is subscribed to branch lp:mvhub.

=== modified file 'app-mvhub/setup/etc/apache2/sites-available/mvhub.conf'
--- app-mvhub/setup/etc/apache2/sites-available/mvhub.conf	2010-07-14 19:09:17 +0000
+++ app-mvhub/setup/etc/apache2/sites-available/mvhub.conf	2010-07-16 21:05:53 +0000
@@ -21,6 +21,7 @@
        AddOutputFilter INCLUDES .shtml 
        AddOutputFilter INCLUDES .inc 
 
+
        <IfModule mpm_itk_module>
           # http://mpm-itk.sesse.net/
           AssignUserID $USER $USER
@@ -30,7 +31,7 @@
        CustomLog /var/www/mvhub/$USER/log/$SITE/referer.log referer
        CustomLog /var/www/mvhub/$USER/log/$SITE/combined.log combined 
        
-       ScriptAlias /cgi-bin /var/www/mvhub/$USER/link-to-live-code/app-mvhub/DocumentRoot/cgi-bin/ 
+       ScriptAlias /cgi-bin  /var/www/mvhub/$USER/link-to-live-code/app-mvhub/DocumentRoot/cgi-bin/ 
        <Directory  /var/www/mvhub/$USER/link-to-live-code/app-mvhub/cgi-bin/>
          Options IncludesNOEXEC ExecCGI
        </Directory>
@@ -70,12 +71,15 @@
           DefaultInitEnv USER                 $USER
        </ifmodule>
 
-	# Use mod_rewrite to make shorter quick-login URLs to send to agencies
        <IfModule mod_rewrite.c>
 	RewriteEngine on
+	# shorten quick login urls
 	RewriteRule ^/(\d{6})/(\w{8})/?$ /cgi-bin/mvhub/agency.pl?rm=ql&aid=$1&qlid=$2 [PT]
+
+        # make easy reports link to share
+        RewriteRule ^/reports[/]*$ /html/reports.shtml
        </IfModule>
-                                                                                           
+                                                                                            
        # Since .htaccess files don't work in the cgi-bin.
        <Directory  /var/www/mvhub/$USER/link-to-live-code/app-mvhub/DocumentRoot/cgi-bin/admin/>
           AuthType Basic
@@ -95,7 +99,8 @@
           # AllowOverride None
           Options IncludesNOEXEC ExecCGI
        </Directory>
-       
+
+      
     </VirtualHost>
 </Macro>
 

=== modified file 'app-mvhub/t/mech/pages.t'
--- app-mvhub/t/mech/pages.t	2010-07-15 16:45:36 +0000
+++ app-mvhub/t/mech/pages.t	2010-07-16 21:05:53 +0000
@@ -84,6 +84,17 @@
             'tests_to_skip' => '',
             'skip_reason'   => '',
         },
+        {   'url'              => "http://$host/reports";,
+            'expected_content' => "PDF Reports",
+            'tests_to_skip'    => '',
+            'skip_reason'      => '',
+        },
+        {   'url'              => "http://$host/reports/";,
+            'expected_content' => "PDF Reports",
+            'tests_to_skip'    => '',
+            'skip_reason'      => '',
+        },
+
         {   'url'              => "http://$host/cgi-bin/mvhub/agency_form.pl";,
             'expected_content' => "Password",
             'tests_to_skip'    => '',