From 7ca6a3fa4e2033c38d6dd36861889fefdd5fa039 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 15 Apr 2014 15:46:03 +0800 Subject: [PATCH] MDL-45073 report_log: setup table if log reader enabled --- report/log/tests/behat/user_log.feature | 18 ++++++++++++++++-- report/log/user.php | 9 +++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/report/log/tests/behat/user_log.feature b/report/log/tests/behat/user_log.feature index a595193d13b..f8b5e9f10fe 100644 --- a/report/log/tests/behat/user_log.feature +++ b/report/log/tests/behat/user_log.feature @@ -33,14 +33,28 @@ Feature: User can view activity log. | Online text | I'm the student first submission | And I press "Save changes" And I log out - And I log in as "teacher1" @javascript Scenario: View Todays' and all log report for user - Given I follow "Course 1" + Given I log in as "teacher1" + And I follow "Course 1" And I navigate to "Participants" node in "Current course > C1" And I follow "Student 1" When I navigate to "Today's logs" node in "Profile settings for Student 1 > Activity reports" And I should see "Assignment: Test assignment name" And I navigate to "All logs" node in "Profile settings for Student 1 > Activity reports" Then I should see "Assignment: Test assignment name" + + @javascript + Scenario: No log reader enabled should be visible when no log store enabled. + Given I log in as "admin" + And I navigate to "Manage log stores" node in "Site administration > Plugins > Logging" + And I click on "Disable" "link" in the "Standard log" "table_row" + And I log out + And I log in as "teacher1" + And I navigate to "Participants" node in "Current course > C1" + And I follow "Student 1" + When I navigate to "Today's logs" node in "Profile settings for Student 1 > Activity reports" + And I should see "No log reader enabled" + And I navigate to "All logs" node in "Profile settings for Student 1 > Activity reports" + Then I should see "No log reader enabled" diff --git a/report/log/user.php b/report/log/user.php index e20514ccfa8..c339e6ceb4f 100644 --- a/report/log/user.php +++ b/report/log/user.php @@ -90,8 +90,13 @@ if ($mode === 'today') { $output = $PAGE->get_renderer('report_log'); $reportlog = new report_log_renderable($logreader, $course, $user->id, 0, '', -1, -1, false, false, true, false, $PAGE->url, $timefrom, '', $page, $perpage, 'timecreated DESC'); -$reportlog->setup_table(); -$reportlog->tablelog->is_downloadable(false); + +// Setup table if log reader is enabled. +if (!empty($reportlog->selectedlogreader)) { + $reportlog->setup_table(); + $reportlog->tablelog->is_downloadable(false); +} + echo $output->reader_selector($reportlog); if ($mode === 'today') {