fixes for group event bugs

diff --git a/views/default/event_calendar/container.php b/views/default/event_calendar/container.php
index fdd7da2c686362e8197e72a8e2f03a1f0e98b784..cb5c8620cee79ff5ce60d98c5f25497171290eb8 100644 (file)
--- a/views/default/event_calendar/container.php
+++ b/views/default/event_calendar/container.php
@@ -1,8 +1,12 @@
 <?php
 elgg_load_library('elgg:event_calendar');
 $site_calendar = elgg_get_plugin_setting('site_calendar', 'event_calendar');
+$group_calendar = elgg_get_plugin_setting('group_calendar', 'event_calendar');
 $admin = elgg_is_admin_logged_in();
-$containers = array(0 => elgg_echo('event_calendar:site_calendar'));
+$containers = array();
+if (($site_calendar != 'no') && ($admin || !$site_calendar || ($site_calendar == 'loggedin'))) {
+       $containers[0] = elgg_echo('event_calendar:site_calendar');
+}
 $user = elgg_get_logged_in_user_entity();
 $groups = $user->getGroups('',0,0);
 foreach ($groups as $group) {

diff --git a/views/default/event_calendar/groupprofile_calendar.php b/views/default/event_calendar/groupprofile_calendar.php
index 7ee09104fb75898bc429ead3aeab08c0bba835d1..c71780be893fc5b7315b49aafe7ab21d800ebdf8 100644 (file)
--- a/views/default/event_calendar/groupprofile_calendar.php
+++ b/views/default/event_calendar/groupprofile_calendar.php
@@ -26,10 +26,8 @@ if (event_calendar_activated_for_group($page_owner_entity)) {
        if (is_array($events) && sizeof($events) > 0) {
 
                foreach($events as $event) {
-                       echo elgg_view("object/event_calendar",array('entity' => $event));
+                       echo elgg_view("object/event_calendar",array('entity' => $event['event']));
                }
                        
     }
 }
-       
-?>
\ No newline at end of file

diff --git a/views/default/forms/event_calendar/edit.php b/views/default/forms/event_calendar/edit.php
index d1c7967c38ba91f423561645eb6f257a79fe3b3d..278fdddcedc517b52f06938775de14446d53bc1e 100644 (file)
--- a/views/default/forms/event_calendar/edit.php
+++ b/views/default/forms/event_calendar/edit.php
@@ -140,7 +140,6 @@ $body = '<div class="event-calendar-edit-form">';
 
 $body .= elgg_view('input/hidden',array('name'=>'event_action', 'value'=>$event_action));
 $body .= elgg_view('input/hidden',array('name'=>'event_guid', 'value'=>$event_guid));
-//$body .= elgg_view('input/hidden',array('name'=>'group_guid', 'value'=>$vars['group_guid']));
 
 $body .= '<div class="event-calendar-edit-form-block event-calendar-edit-form-top-block">';
 
@@ -164,10 +163,14 @@ $body .= elgg_view("input/tags",array('name' => 'tags','class'=>'event-calendar-
 $body .= '</p>';
 $body .= '<p class="event-calendar-description">'.$prefix['event_tags'].elgg_echo('event_calendar:event_tags_description').'</p>';
 
-$body .= '<p><label>'.elgg_echo("event_calendar:calendar_label").'</label>';
-$body .= elgg_view('event_calendar/container',array('container_guid'=>$vars['group_guid']));
-$body .= '</p>';
-$body .= '<p class="event-calendar-description">'.$prefix['calendar'].elgg_echo('event_calendar:calendar_description').'</p>';
+if ($event || !$vars['group_guid']) {
+       $body .= '<p><label>'.elgg_echo("event_calendar:calendar_label").'</label>';
+       $body .= elgg_view('event_calendar/container',array('container_guid'=>$vars['group_guid']));
+       $body .= '</p>';
+       $body .= '<p class="event-calendar-description">'.$prefix['calendar'].elgg_echo('event_calendar:calendar_description').'</p>';
+} else {
+       $body .= elgg_view('input/hidden',array('name'=>'group_guid', 'value'=>$vars['group_guid']));
+}
 
 if($event_calendar_bbb_server_url) {
        $body .= '<p>';