moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-53738 feedback: enable mod and block by default

Browse source
This commit is contained in:
Marina Glancy 2016-04-07 16:47:19 +08:00
parent 6bd3ab0717
commit aeeeb78847
16 changed files with 4 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

11
blocks/activity_modules/tests/behat/block_activity_modules.feature
View file

@ -4,11 +4,6 @@ Feature: Block activity modules
As a manager
I can add activities block in a course or on the frontpage
Background:
Given I log in as "admin"
And I navigate to "Manage activities" node in "Site administration > Plugins > Activity modules"
And I click on "//a[@title=\"Show\"]" "xpath_element" in the "Feedback" "table_row"
Scenario: Add activities block on the frontpage
Given the following "activities" exist:
| activity | name | intro | course | idnumber |
@ -34,8 +29,9 @@ Feature: Block activity modules
| wiki | Frontpage wiki name | Frontpage wiki description | Acceptance test site | wiki0 |
| workshop | Frontpage workshop name | Frontpage workshop description | Acceptance test site | workshop0 |
When I log in as "admin"
And I am on site homepage
When I follow "Turn editing on"
And I follow "Turn editing on"
And I add the "Activities" block
And I click on "Assignments" "link" in the "Activities" "block"
Then I should see "Frontpage assignment name"
@ -112,7 +108,8 @@ Feature: Block activity modules
| wiki | Test wiki name | Test wiki description | C1 | wiki1 |
| workshop | Test workshop name | Test workshop description | C1 | workshop1 |
When I follow "Courses"
When I log in as "admin"
And I follow "Courses"
And I follow "Course 1"
And I turn editing mode on
And I add the "Activities" block

10
blocks/feedback/block_feedback.php
View file

@ -22,11 +22,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
if (is_file($CFG->dirroot.'/mod/feedback/lib.php')) {
require_once($CFG->dirroot.'/mod/feedback/lib.php');
define('FEEDBACK_BLOCK_LIB_IS_OK', true);
}
class block_feedback extends block_list {
function init() {
@ -49,11 +44,6 @@ class block_feedback extends block_list {
$this->content->icons = array();
$this->content->footer = '';
if (!defined('FEEDBACK_BLOCK_LIB_IS_OK')) {
$this->content->items = array(get_string('missing_feedback_module', 'block_feedback'));
return $this->content;
}
$courseid = $this->page->course->id;
if ($courseid <= 0) {
$courseid = SITEID;

3
blocks/feedback/db/install.php
View file

@ -25,8 +25,5 @@
function xmldb_block_feedback_install() {
global $DB;
/// Disable this block by default (because Feedback is not technically part of 2.0)
$DB->set_field('block', 'visible', 0, array('name'=>'feedback'));
}

1
blocks/feedback/lang/en/block_feedback.php
View file

@ -24,5 +24,4 @@
$string['feedback'] = 'Feedback';
$string['feedback:addinstance'] = 'Add a new feedback block';
$string['missing_feedback_module'] = 'This blocks relies on the Feedback activity module, but that module is not present!';
$string['pluginname'] = 'Feedback';