removed old widget file

Allows calendar widget to be useful in groups context

diff --git a/models/model.php b/models/model.php
index 2752626bcad64165a859a7c6ffd7b0baa61ff591..ba1393a8cac91fcf4b426919d3d7fb9d80c84096 100644 (file)
--- a/models/model.php
+++ b/models/model.php
@@ -1150,12 +1150,12 @@ function event_calendar_security_fields() {
        return "__elgg_token=$token&__elgg_ts=$ts";
 }
 
-function event_calendar_get_events_for_group($group_guid) {
+function event_calendar_get_events_for_group($group_guid, $limit = 0) {
        $options = array(
                'type' => 'object',
                'subtype' => 'event_calendar',
                'container_guid' => $group_guid,
-               'limit' => 0,
+               'limit' => $limit,
        );
        return elgg_get_entities($options);
 }

diff --git a/views/default/widgets/event_calendar/content.php b/views/default/widgets/event_calendar/content.php
index 329046cb045821b200cdacd369bb62087758cf1d..eaedb76bdffba404b600ea6d9f0341cf336ab946 100644 (file)
--- a/views/default/widgets/event_calendar/content.php
+++ b/views/default/widgets/event_calendar/content.php
@@ -20,8 +20,12 @@
                $num = 5;
                
     // Get the events
-
-       $events = event_calendar_get_personal_events_for_user(elgg_get_page_owner_guid(),$num);
+  $owner = elgg_get_page_owner_entity();
+  if(elgg_instanceof($owner, 'group')) {
+    $events = event_calendar_get_events_for_group(elgg_get_page_owner_guid(),$num);
+  } else {
+    $events = event_calendar_get_personal_events_for_user(elgg_get_page_owner_guid(),$num);
+  }
                
        // If there are any events to view, view them
        if (is_array($events) && sizeof($events) > 0) {

diff --git a/views/default/widgets/event_calendar/view.php b/views/default/widgets/event_calendar/view.php
deleted file mode 100644 (file)
index 329046c..0000000
--- a/views/default/widgets/event_calendar/view.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Elgg event calendar widget
- *
- * @package event_calendar
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Kevin Jardine <kevin@radagast.biz>
- * @copyright Radagast Solutions 2008
- * @link http://radagast.biz/
- *
- */
-
-       // Load event calendar model
-       elgg_load_library('elgg:event_calendar');
-
-    //the number of events to display
-       $num = (int) $vars['entity']->num_display;
-       if (!$num)
-               $num = 5;
-               
-    // Get the events
-
-       $events = event_calendar_get_personal_events_for_user(elgg_get_page_owner_guid(),$num);
-               
-       // If there are any events to view, view them
-       if (is_array($events) && sizeof($events) > 0) {
-
-               echo "<div id=\"widget_calendar\">";
-
-               foreach($events as $event) {
-                       echo elgg_view("object/event_calendar",array('entity' => $event));
-               }
-
-               echo "</div>";
-                       
-    }
-       
-?>
\ No newline at end of file