Permalink
Browse files

MDL-33646 book: Adding a notice instead of error when there is no con…

…tent in the book
  • Loading branch information...
1 parent 5d6285c commit 5219cc87ec7d398d0130c308d852d0c811425c22 @ankitagarwal ankitagarwal committed Oct 4, 2012
Showing with 10 additions and 6 deletions.
  1. +1 −0 mod/book/lang/en/book.php
  2. +9 −6 mod/book/view.php
@@ -47,6 +47,7 @@
$string['chaptertitle'] = 'Chapter title';
$string['content'] = 'Content';
$string['subchapter'] = 'Subchapter';
+$string['nocontent'] = 'No content has been added to this book yet.';
$string['numbering'] = 'Chapter formatting';
$string['numbering_help'] = '* None - Chapter and subchapter titles have no formatting
* Numbers - Chapters and subchapter titles are numbered 1, 1.1, 1.2, 2, ...
View
@@ -87,13 +87,16 @@
}
}
-if (!$chapterid or !$chapter = $DB->get_record('book_chapters', array('id'=>$chapterid, 'bookid'=>$book->id))) {
- print_error('errorchapter', 'mod_book', new moodle_url('/course/view.php', array('id'=>$course->id)));
-}
+$courseurl = new moodle_url('/course/view.php', array('id' => $course->id));
-// chapter is hidden for students
-if ($chapter->hidden and !$viewhidden) {
- print_error('errorchapter', 'mod_book', new moodle_url('/course/view.php', array('id'=>$course->id)));
+// No content in the book.
+if (!$chapterid) {
+ $PAGE->set_url('/mod/book/view.php', array('id' => $id));
+ notice(get_string('nocontent', 'mod_book'), $courseurl->out(false));
+}
+// Chapter doesnt exist or it is hidden for students
+if ((!$chapter = $DB->get_record('book_chapters', array('id' => $chapterid, 'bookid' => $book->id))) or ($chapter->hidden and !$viewhidden)) {
+ print_error('errorchapter', 'mod_book', $courseurl);
}
$PAGE->set_url('/mod/book/view.php', array('id'=>$id, 'chapterid'=>$chapterid));

0 comments on commit 5219cc8

Please sign in to comment.