Commit 5219cc87 authored by Ankit Agarwal's avatar Ankit Agarwal
Browse files

MDL-33646 book: Adding a notice instead of error when there is no content in the book

parent 5d6285c2
...@@ -47,6 +47,7 @@ $string['editingchapter'] = 'Editing chapter'; ...@@ -47,6 +47,7 @@ $string['editingchapter'] = 'Editing chapter';
$string['chaptertitle'] = 'Chapter title'; $string['chaptertitle'] = 'Chapter title';
$string['content'] = 'Content'; $string['content'] = 'Content';
$string['subchapter'] = 'Subchapter'; $string['subchapter'] = 'Subchapter';
$string['nocontent'] = 'No content has been added to this book yet.';
$string['numbering'] = 'Chapter formatting'; $string['numbering'] = 'Chapter formatting';
$string['numbering_help'] = '* None - Chapter and subchapter titles have no 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, ... * Numbers - Chapters and subchapter titles are numbered 1, 1.1, 1.2, 2, ...
......
...@@ -87,13 +87,16 @@ if ($chapterid == '0') { // Go to first chapter if no given. ...@@ -87,13 +87,16 @@ if ($chapterid == '0') { // Go to first chapter if no given.
} }
} }
if (!$chapterid or !$chapter = $DB->get_record('book_chapters', array('id'=>$chapterid, 'bookid'=>$book->id))) { $courseurl = new moodle_url('/course/view.php', array('id' => $course->id));
print_error('errorchapter', 'mod_book', new moodle_url('/course/view.php', array('id'=>$course->id)));
}
// chapter is hidden for students // No content in the book.
if ($chapter->hidden and !$viewhidden) { if (!$chapterid) {
print_error('errorchapter', 'mod_book', new moodle_url('/course/view.php', array('id'=>$course->id))); $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)); $PAGE->set_url('/mod/book/view.php', array('id'=>$id, 'chapterid'=>$chapterid));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment