Half the work done for bug 1330:

Now when creating events you don't select a course, the current course is
selected implicitly.

diff --git a/calendar/event.php b/calendar/event.php
index eabd3dfe70c8cc32ce27d4075512201c1b825ff4..3293065a41f218b442123990ca6e5c38da4b38ce 100644 (file)
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -163,7 +163,7 @@
 
                     /// Log the event entry.
                     add_to_log($form->courseid, 'calendar', 'add', 'event.php?action=edit&id='.$eventid, $form->name);
-                    
+
                     if ($form->repeat) {
                         for($i = 1; $i < $form->repeats; $i++) {
                             $form->timestart += 604800;  // add one week
@@ -173,7 +173,7 @@
                             add_to_log($form->courseid, 'calendar', 'add', 'event.php?action=edit&amp;id='.$eventid, $form->name);
                         }
                     }
-                            
+
                     // OK, now redirect to day view
                     redirect(CALENDAR_URL.'view.php?view=day&cal_d='.$form->startday.'&cal_m='.$form->startmon.'&cal_y='.$form->startyr);
                 }
@@ -381,7 +381,7 @@
             print_side_block_start(get_string('newevent', 'calendar').$header, '', 'mycalendar');
             if($_REQUEST['type'] == 'select') {
                 optional_variable($_REQUEST['groupid']);
-                optional_variable($_REQUEST['courseid']);
+                optional_variable($_REQUEST['courseid'], $SESSION->cal_course_referer);
                 $groupid = $_REQUEST['groupid'];
                 $courseid = $_REQUEST['courseid'];
                 include('event_select.html');

diff --git a/calendar/event_select.html b/calendar/event_select.html
index 15a9fe942c896898a149c18c11740801ac43d8b2..47c2c3de9333a57da196c5ffa10ea2facd08a990 100644 (file)
--- a/calendar/event_select.html
+++ b/calendar/event_select.html
@@ -20,18 +20,11 @@
       </select>\r
       </div>\r
     <?php } ?>\r
-    <?php if(!empty($allowed->courses)) { ?><p><input type='radio' name='type' value='course' id='type_course' /><label for='type_course'><?php print_string('typecourse', 'calendar') ?></label></p>\r
-      <div style="padding-left: 1.5em;">\r
-      <?php print_string('course'); ?>:\r
-      <select name='courseid'>\r
-        <option value=''></option>\r
-      <?php foreach($allowed->courses as $course) {?>\r
-        <option value='<?php echo $course->id?>' <?php if($course->id == $courseid) echo 'selected="selected"';?>><?php echo $course->shortname.' - '.$course->fullname?></option>\r
-      <?php }?>\r
-      </select>\r
-      </div>\r
+    <?php if(!empty($allowed->courses)) { ?>\r
+      <p><input type='radio' name='type' value='course' id='type_course' /><input type="hidden" name="courseid" value="<?php echo($courseid) ?>" /><label for='type_course'><?php print_string('typecourse', 'calendar') ?></label></p>\r
     <?php } ?>\r
-    <?php if(!empty($allowed->site)) { ?><p><input type='radio' name='type' value='site' id='type_site' /><label for='type_site'><?php print_string('typesite', 'calendar') ?></label></p>\r
+    <?php if(!empty($allowed->site)) { ?>\r
+      <p><input type='radio' name='type' value='site' id='type_site' /><label for='type_site'><?php print_string('typesite', 'calendar') ?></label></p>\r
     <?php } ?>\r
     </td>\r
   </tr>\r