[Fmsystem-commits] [9886]

[Erik Holm-Larsen]

Revision: 9886
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9886
Author:   erikhl
Date:     2012-08-21 07:12:59 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendar/setup/phpgw_no.lang
    trunk/activitycalendar/templates/base/activity_list_partial.php

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-21 
06:53:41 UTC (rev 9885)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-21 
07:12:59 UTC (rev 9886)
@@ -522,14 +522,16 @@
                //$link_text = "<a 
href='{$mailBaseURL}?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}'>Rediger
 opplysninger for {$activity->get_title()}</a>";
                $link_text = "<a 
href='http://www.bergen.kommune.no/aktivitetsoversikt/?menuaction=activitycalendarfrontend.uiactivity.edit&amp;id={$activity->get_id()}&amp;secret={$activity->get_secret()}'>Rediger
 opplysninger for {$activity->get_title()}</a>";
                 $office_name = 
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
-                //$office_footer = 
activitycalendar_soactivity::get_instance()->get_office_description($activity->get_office());
+                $uid = $GLOBALS['phpgw_info']['user']['account_id'];
+               $user_office_id =  
activitycalendar_soactivity::get_instance()->get_office_from_user($uid);
+                $office_footer = 
activitycalendar_soactivity::get_instance()->get_office_description($user_office_id);
                if($activity->get_state() == 2)
                {
-                       $body = lang('mail_body_update_frontend', 
$activity->get_title(), $link_text, $office_name);// . 
'<br/><br/>'.$office_footer;
+                       $body = lang('mail_body_update_frontend', 
$activity->get_title(), $link_text, $office_name) . '<br/><br/>'.$office_footer;
                }
                else
                {
-                       $body = lang('mail_body_update', 
$activity->get_title(), $link_text, $office_name);// . 
'<br/><br/>'.$office_footer;
+                       $body = lang('mail_body_update', 
$activity->get_title(), $link_text, $office_name) . '<br/><br/>'.$office_footer;
                }
                
                //var_dump($subject);

Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang  2012-08-21 06:53:41 UTC (rev 
9885)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2012-08-21 07:12:59 UTC (rev 
9886)
@@ -386,7 +386,7 @@
 send_mail      activitycalendar        no      Send e-post
 marked_as      activitycalendar        no      Status
 address_number activitycalendar        no      Husnummer
-changed_organizations_groups   activitycalendar        no      Endrede 
organisasjoner/grupper
+changed_organizations_groups   activitycalendar        no      Endrede 
organisasjoner
 changed_org_group      activitycalendar        no      Endringer
 building       activitycalendar        no      Kommunale bygg
 Download as excel      activitycalendar        no      Last ned i Excel-format

Modified: trunk/activitycalendar/templates/base/activity_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/activity_list_partial.php     
2012-08-21 06:53:41 UTC (rev 9885)
+++ trunk/activitycalendar/templates/base/activity_list_partial.php     
2012-08-21 07:12:59 UTC (rev 9886)
@@ -185,6 +185,10 @@
        {
                $uid = $GLOBALS['phpgw_info']['user']['account_id'];
                $user_office =  
activitycalendar_soactivity::get_instance()->get_office_from_user($uid);
+                if($user_office && $user_office == 1)
+                    $user_office = 2;
+                else if($user_office == 2)
+                    $user_office = 1;
 ?>
 
 <form id="<?php echo $list_id ?>_form" method="GET">