[Fmsystem-commits] [7393]

[Erik Holm-Larsen]

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


Modified Paths:
--------------
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/templates/base/activity.php

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-06-17 
06:35:19 UTC (rev 7392)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-06-17 
11:42:27 UTC (rev 7393)
@@ -4,6 +4,7 @@
        phpgw::import_class('activitycalendar.sogroup');
        
        include_class('activitycalendar', 'activity', 'inc/model/');
+       include_class('activitycalendar', 'group', 'inc/model/');
 
        class activitycalendarfrontend_uiactivity extends 
activitycalendar_uiactivities
        {

Modified: trunk/activitycalendarfrontend/templates/base/activity.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity.php  2011-06-17 
06:35:19 UTC (rev 7392)
+++ trunk/activitycalendarfrontend/templates/base/activity.php  2011-06-17 
11:42:27 UTC (rev 7393)
@@ -5,7 +5,6 @@
        $contpers_so = activitycalendar_socontactperson::get_instance();
 ?>
 
-<script src="phpgwapi/js/yui3/json/json-min.js" charset="utf-8"></script>
 <script type="text/javascript">
 
 function get_available_groups()
@@ -23,6 +22,7 @@
                success: function(response){
                                        //alert("det funker");
                                        group_select.innerHTML = 
JSON.parse(response.responseText);
+                                       //group_select.innerHTML = 
group_select.innerHTML;
                                },
                failure: function(o) {
                                         alert("AJAX doesn't work"); //FAILURE
@@ -76,7 +76,7 @@
                                        if ($editable)
                                        {
                                                ?>
-                                               <select name="organization_id">
+                                               <select name="organization_id" 
id="organization_id" onchange="javascript:get_available_groups();">
                                                        <option value="">Ingen 
organisasjon valgt</option>
                                                        <?php
                                                        foreach($organizations 
as $organization)
@@ -108,14 +108,8 @@
                                        if ($editable)
                                        {
                                                ?>
-                                               <select name="group_id">
+                                               <select name="group_id" 
id="group_id">
                                                        <option value="0">Ingen 
gruppe valgt</option>
-                                                       <?php
-                                                       foreach($groups as 
$group)
-                                                       {
-                                                               echo "<option 
".($current_group_id == $group->get_id() ? 'selected="selected"' : "")." 
value=\"{$group->get_id()}\">".$group->get_name()."</option>";
-                                                       }
-                                                       ?>
                                                </select>
                                                <?php
                                        ?>