[Fmsystem-commits] [8075]

[Erik Holm-Larsen]

Revision: 8075
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8075
Author:   erikhl
Date:     2011-11-11 06:47:42 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.sogroup.inc.php
    trunk/activitycalendar/inc/class.soorganization.inc.php
    trunk/activitycalendar/setup/phpgw_no.lang
    trunk/activitycalendar/templates/base/dashboard.php

Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php    2011-11-11 06:39:47 UTC 
(rev 8074)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php    2011-11-11 06:47:42 UTC 
(rev 8075)
@@ -84,6 +84,15 @@
                                $filter_clauses[] = "activity_group.id = {$id}";
                        }
                }
+               if(isset($filters['new_groups'])){
+                       $use_local_group = true;
+                       unset($filter_clauses);
+                       $filter_clauses[] = "activity_group.change_type = 
'new'";
+                       if(isset($filters[$this->get_id_field_name()])){
+                               $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                               $filter_clauses[] = "activity_group.id = {$id}";
+                       }
+               }
                
                if(count($filter_clauses))
                {

Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php     2011-11-11 
06:39:47 UTC (rev 8074)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php     2011-11-11 
06:47:42 UTC (rev 8075)
@@ -102,6 +102,17 @@
                                $filter_clauses[] = "org.id = {$id}";
                        }
                }
+               if(isset($filters['new_orgs'])){
+                       $use_local_org = true;
+                       //$id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                       //$filter_clauses[] = "org.id = {$id}";
+                       unset($filter_clauses);
+                       $filter_clauses[] = "org.change_type = 'new'";
+                       if(isset($filters[$this->get_id_field_name()])){
+                               $id = 
$this->marshal($filters[$this->get_id_field_name()],'int');
+                               $filter_clauses[] = "org.id = {$id}";
+                       }
+               }
 
 /*
                // All parties with contracts of type X

Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang  2011-11-11 06:39:47 UTC (rev 
8074)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2011-11-11 06:47:42 UTC (rev 
8075)
@@ -64,7 +64,7 @@
 cost   activitycalendar        no      Pris
 create activitycalendar        no      Lagre
 created        activitycalendar        no      Opprettet
-dashboard      activitycalendar        no      Skrivebord
+dashboard      activitycalendar        no      Skrivebord - Innkomne endringer
 day of the week        activitycalendar        no      Ukedag
 dec    activitycalendar        no      desember
 description    activitycalendar        no      Beskrivelse

Modified: trunk/activitycalendar/templates/base/dashboard.php
===================================================================
--- trunk/activitycalendar/templates/base/dashboard.php 2011-11-11 06:39:47 UTC 
(rev 8074)
+++ trunk/activitycalendar/templates/base/dashboard.php 2011-11-11 06:47:42 UTC 
(rev 8075)
@@ -7,8 +7,8 @@
 <h2><?php echo lang('organization')?></h2>
 <?php
        $list_form = true;
-       $list_id = 'changed_organizations';
-       $url_add_on = '&amp;type=changed_organizations';
+       $list_id = 'new_organizations';
+       $url_add_on = '&amp;type=new_organizations';
        $nosearch = true;
        $extra_cols = array(array("key" => "change_type", "label" => 
lang('change_type'), "sortable" => true, "index" => 5));
        include('organization_list_partial.php');
@@ -16,8 +16,8 @@
 <h2><?php echo lang('group')?></h2>
 <?php
        $list_form = true;
-       $list_id = 'changed_groups';
-       $url_add_on = '&amp;type=changed_groups';
+       $list_id = 'new_groups';
+       $url_add_on = '&amp;type=new_groups';
        $nosearch = true;
        $extra_cols = array(array("key" => "change_type", "label" => 
lang('change_type'), "sortable" => true, "index" => 5));
        include('organization_list_partial.php');