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

Merge branch 'MDL-52054-master-option4' of git://github.com/xow/moodle

Browse source
This commit is contained in:
Dan Poltawski 2015-11-10 09:17:51 +00:00
commit 022f5b5e50
2 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/forum/discuss.php
View file

@ -169,7 +169,7 @@ if ($move > 0 and confirm_sesskey()) {
forum_rss_delete_file($forum); forum_rss_delete_file($forum);
forum_rss_delete_file($forumto); forum_rss_delete_file($forumto);
redirect($return.'&moved=-1&sesskey='.sesskey()); redirect($return.'&move=-1&sesskey='.sesskey());
} }
// Trigger discussion viewed event. // Trigger discussion viewed event.
@ -325,8 +325,8 @@ if ($forum->type != 'single'
if (!empty($forummenu)) { if (!empty($forummenu)) {
echo '<div class="movediscussionoption">'; echo '<div class="movediscussionoption">';
$select = new url_select($forummenu, '', $select = new url_select($forummenu, '',
array(''=>get_string("movethisdiscussionto", "forum")), array('/mod/forum/discuss.php?d=' . $discussion->id => get_string("movethisdiscussionto", "forum")),
'forummenu'); 'forummenu', get_string('move'));
echo $OUTPUT->render($select); echo $OUTPUT->render($select);
echo "</div>"; echo "</div>";
} }

41
mod/forum/tests/behat/move_discussion.feature Normal file
View file

@ -0,0 +1,41 @@
@mod @mod_forum
Feature: A teacher can move discussions between forums
In order to move a discussion
As a teacher
I need to use the move discussion selector
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
And the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
Scenario: A teacher can move discussions
Given the following "activities" exist:
| activity | name | intro | course | idnumber | groupmode |
| forum | Test forum 1 | Test forum 2 | C1 | forum | 0 |
| forum | Test forum 2 | Test forum 1 | C1 | forum | 0 |
And I log in as "student1"
And I follow "Course 1"
And I follow "Test forum 1"
And I add a new discussion to "Test forum 1" forum with:
| Subject | Discussion 1 |
| Message | Test post message |
And I wait "1" seconds
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I follow "Test forum 1"
And I follow "Discussion 1"
When I set the field "jump" to "Test forum 2"
And I press "Move"
Then I should see "This discussion has been moved to 'Test forum 2'."
And I press "Move"
And I should see "Discussion 1"