From: defacer <defacer>
Date: Wed, 23 Jun 2004 09:43:00 +0000 (+0000)
Subject: Fix for bug 1528:
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1cbcc2c3d0fcdd839942b4f8c0e8ec8a89da08f7;p=moodle.git

Fix for bug 1528:

Now the edit icon in day view for course activity events takes you to the
activity update form, and not the view. You can still go to the activity view
by clicking the activity name in the event title.
---

diff --git a/calendar/view.php b/calendar/view.php
index 8715d65dc4..a76898ca10 100644
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -578,11 +578,11 @@ function calendar_print_event($event) {
     if (calendar_edit_event_allowed($event)) {
         echo '<div align="right">';
         if (empty($event->cmid)) {
-            $editlink = CALENDAR_URL.'event.php?action=edit&amp;id='.$event->id;
+            $editlink   = CALENDAR_URL.'event.php?action=edit&amp;id='.$event->id;
             $deletelink = CALENDAR_URL.'event.php?action=delete&amp;id='.$event->id;
         } else {
-            $editlink   = "$CFG->wwwroot/mod/$event->modulename/view.php?id=$event->cmid";
-            $deletelink = "$CFG->wwwroot/course/mod.php?delete=$event->cmid";
+            $editlink   = $CFG->wwwroot.'/course/mod.php?update='.$event->cmid.'&amp;return=true';
+            $deletelink = $CFG->wwwroot.'/course/mod.php?delete='.$event->cmid;
         }
         echo ' <a href="'.$editlink.'"><img
                   src="'.$CFG->pixpath.'/t/edit.gif" alt="'.get_string('tt_editevent', 'calendar').'"