[Fmsystem-commits] [9879] bugfixes

[Erik Holm-Larsen]

Revision: 9879
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9879
Author:   erikhl
Date:     2012-08-20 11:48:34 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
bugfixes

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-20 
11:28:53 UTC (rev 9878)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2012-08-20 
11:48:34 UTC (rev 9879)
@@ -305,12 +305,12 @@
                                                $subject = 
lang('mail_subject_update');
                                                $body = lang('mail_body_state_' 
. $new_state, $kontor);
                                                
-                                               
if(isset($activity->get_group_id()) && $activity->get_group_id() > 0)
+                                               if($activity->get_group_id() && 
$activity->get_group_id() > 0)
                                                {
                                                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
 true));
                                                        
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),$subject,$body);
                                                }
-                                               else if 
(isset($activity->get_organization_id()) && $activity->get_organization_id() > 
0)
+                                               else if 
($activity->get_organization_id() && $activity->get_organization_id() > 0)
                                                {
                                                        
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
                                                        
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),$subject,$body);
@@ -775,5 +775,4 @@
                 }
             }
         }
-}
-?>
+}
\ No newline at end of file

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-20 
11:28:53 UTC (rev 9878)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-08-20 
11:48:34 UTC (rev 9879)
@@ -551,9 +551,11 @@
                                                     if($arena_arr[0] == 'i')
                                                     {
                                                         
$activity->set_internal_arena($arena_arr[1]);
+                                                        
$activity->set_arena(0);
                                                     }
                                                     else
                                                     {
+                                                        
$activity->set_internal_arena(0);
                                                         
$activity->set_arena($arena_arr[1]);
                                                     }
                                                     //$district_array = 
phpgw::get_var('district');

Modified: trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php       
2012-08-20 11:28:53 UTC (rev 9878)
+++ trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php       
2012-08-20 11:48:34 UTC (rev 9879)
@@ -29,11 +29,12 @@
        var org_id = document.getElementById("organization_id_hidden");
        var text = document.getElementById("displayText3");
        if(ele.style.display == "block") {
-       ele.style.display = "none";
-               text.innerHTML = "Registrer ny organisasjon";
+            ele.style.display = "none";
+            text.innerHTML = "Registrer ny organisasjon";
        }
        else {
                ele.style.display = "block";
+                ele.style.visibility = "visible";
                text.innerHTML = "";
                org_id.value = "new_org";
        }
@@ -164,7 +165,7 @@
                                <br/>
                        </dd>
                        <a id="displayText3" href="javascript:toggle3();">Ikke 
i listen? Registrer ny organisasjon</a><br/>
-                               <DIV style="overflow: auto; display: none;" 
id="toggleText3">
+                               <DIV style="overflow: auto; display: none; 
visibility: hidden;" id="toggleText3">
                                        <DIV style="overflow: auto;">
                                                <P>Registrer ny organisasjon <A 
onclick="window.open('hjelp.html','name','height=255, 
width=350,toolbar=no,directories=no,status=no, 
menubar=no,scrollbars=no,resizable=no'); return false;" 
                                                        
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";