[Fmsystem-commits] [7374]

[Erik Holm-Larsen]

Revision: 7374
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7374
Author:   erikhl
Date:     2011-06-14 07:31:01 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-06-14 07:12:22 UTC 
(rev 7373)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-06-14 07:31:01 UTC 
(rev 7374)
@@ -150,19 +150,8 @@
                }
                if(isset($filters['activity_district']) && 
$filters['activity_district'] != 'all'){
                        $activity_district = 
$this->marshal($filters['activity_district'],'int');
-                       $filter_clauses[] = "activity.district = 
'{$activity_district}'";
+                       $filter_clauses[] = "activity.office = 
'{$activity_district}'";
                }
-/*
-               // All parties with contracts of type X
-               if(isset($filters['party_type']))
-               {
-                       $party_type = 
$this->marshal($filters['party_type'],'int');
-                       if(isset($party_type) && $party_type > 0)
-                       {
-                               $filter_clauses[] = "contract.location_id = 
{$party_type}";
-                       }
-               }
-*/             
                
                if(count($filter_clauses))
                {