[Fmsystem-commits] [7389]

[Erik Holm-Larsen]

Revision: 7389
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7389
Author:   erikhl
Date:     2011-06-16 12:38:13 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.uiorganization.inc.php
    trunk/activitycalendar/templates/base/activity.php

Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-06-16 
11:54:43 UTC (rev 7388)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-06-16 
12:38:13 UTC (rev 7389)
@@ -148,6 +148,10 @@
        
        public function get_organization_groups()
        {
+               $GLOBALS['phpgw_info']['flags']['noheader'] = true; 
+               $GLOBALS['phpgw_info']['flags']['nofooter'] = true; 
+               $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+               
                $org_id = phpgw::get_var('orgid');
                $group_id = phpgw::get_var('groupid');
                $returnHTML = "<option value='0'>Ingen gruppe valgt</option>";
@@ -162,9 +166,9 @@
                                        if($group_id && $group_id > 0)
                                        {
                                                $gr_id = (int)$group_id; 
-                                               if($gr_id == $group->get_id())
+                                               if($gr_id == 
(int)$group->get_id())
                                                {
-                                                       $selected = "selected";
+                                                       $selected_group = " 
selected";
                                                }
                                        }
                                        $group_html[] = "<option value='" . 
$group->get_id() . "'". $selected_group . ">" . $group->get_name() . 
"</option>";

Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php  2011-06-16 11:54:43 UTC 
(rev 7388)
+++ trunk/activitycalendar/templates/base/activity.php  2011-06-16 12:38:13 UTC 
(rev 7389)
@@ -27,7 +27,7 @@
        var callback = {
                success: function(response){
                                        //alert("det funker");
-                                       group_select.innerHTML = 
response.responseText;
+                                       group_select.innerHTML = 
JSON.parse(response.responseText);
                                },
                failure: function(o) {
                                         alert("AJAX doesn't work"); //FAILURE
@@ -37,6 +37,11 @@
        
 }
 
+YAHOO.util.Event.onDOMReady(function()
+{
+       get_available_groups();
+});
+
 </script>
 
 <div class="yui-content">