Просмотр исходного кода

Minor - add announcement when adding an event, also adding the AnnouncementManager class to the autoload class see #4404

Julio Montoya 12 лет назад
Родитель
Сommit
7ed50b094b

+ 4 - 2
main/calendar/agenda.lib.php

@@ -151,8 +151,7 @@ class Agenda {
             //build the announcement text
             $content = $row['content'];
             //insert announcement
-            $session_id = api_get_session_id();
-            
+            $session_id = api_get_session_id();            
             
             $sql_ins = "INSERT INTO $table_ann (c_id, title,content,end_date,display_order,session_id) " .
                         "VALUES ($course_id, '".Database::escape_string($row['title'])."','".Database::escape_string($content)."','".Database::escape_string($row['end_date'])."','$max','$session_id')";
@@ -160,6 +159,9 @@ class Agenda {
             
             if ($res_ins) {
                 $ann_id = Database::insert_id();
+                
+                AnnouncementManager::send_email($ann_id);
+                
                 //Now also get the list of item_properties rows for this agenda_item (calendar_event)
                 //and copy them into announcement item_properties
                 $table_props = Database::get_course_table(TABLE_ITEM_PROPERTY);

+ 2 - 1
main/inc/lib/autoload.class.php

@@ -68,7 +68,8 @@ class Autoload
         $result['AddManySessionToCategoryFunctions'] = '/main/inc/lib/add_many_session_to_category_functions.lib.php';
         $result['AdminPage'] = '/main/admin/admin_page.class.php';
         $result['Agenda'] = '/main/calendar/agenda.lib.php';
-        $result['Announcement'] = '/main/coursecopy/classes/Announcement.class.php';
+        $result['Announcement'] = '/main/coursecopy/classes/Announcement.class.php';        
+        $result['AnnouncementManager'] = '/main/announcements/announcements.inc.php';
         $result['AnnouncementEmail'] = '/main/announcements/announcement_email.class.php';
         $result['Answer'] = '/main/exercice/answer.class.php';
         $result['AppPlugin'] = '/main/inc/lib/plugin.lib.php';

+ 1 - 1
main/template/default/agenda/month.tpl

@@ -467,7 +467,7 @@ $(document).ready(function() {
                 <label></label>
                 <div class="controls">                    
                     <label class="checkbox inline" for="add_as_annonuncement">
-                        {{ "AddAsAnnouncement"|get_lang }}
+                        {{ "AddAsAnnouncement"|get_lang }} ({{ "SendEmail" | get_lang }})
                         <input type="checkbox" name="add_as_annonuncement" id="add_as_annonuncement" />                    
                     </label>                    
                 </div>