[Fmsystem-commits] [8181]

[Erik Holm-Larsen]

Revision: 8181
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8181
Author:   erikhl
Date:     2011-11-24 06:53:32 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/templates/base/activity_list_partial.php

Modified: trunk/activitycalendar/templates/base/activity_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/activity_list_partial.php     
2011-11-23 21:24:12 UTC (rev 8180)
+++ trunk/activitycalendar/templates/base/activity_list_partial.php     
2011-11-24 06:53:32 UTC (rev 8181)
@@ -130,8 +130,9 @@
     function activity_export(ptype) {
 
         var query = document.getElementById('<?php echo $list_id 
?>_ctrl_search_query').value;
-        var office = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_state').value;
-        var state = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_district').value;
+        var office = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_district').value;
+        var state = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_state').value;
+        var category = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_category').value;
         <?php
         /* FIXME Search queries will affect ALL data tables listed on one page 
(of that type) when exporting
          * even though the search only affects one of the data tables.
@@ -144,14 +145,16 @@
             '&amp;query='+query+
             '&amp;activity_district='+office+
             '&amp;activity_state='+state+
+            '&amp;activity_category='+category+
                '&amp;export=true';
     }
 
     function activity_email(ptype) {
 
         var query = document.getElementById('<?php echo $list_id 
?>_ctrl_search_query').value;
-        var office = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_state').value;
-        var state = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_district').value;
+        var office = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_district').value;
+        var state = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_state').value;
+        var category = document.getElementById('<?php echo $list_id 
?>_ctrl_toggle_activity_category').value;
         <?php
         /* FIXME Search queries will affect ALL data tables listed on one page 
(of that type) when exporting
          * even though the search only affects one of the data tables.
@@ -164,6 +167,7 @@
             '&amp;query='+query+
             '&amp;activity_district='+office+
             '&amp;activity_state='+state+
+            '&amp;activity_category='+category+
                '&amp;email=true';
     }