Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
e74ff55f
Commit
e74ff55f
authored
Nov 10, 2015
by
Dan Poltawski
Browse files
Merge branch 'MDL-52063-28' of
git://github.com/xow/moodle
into MOODLE_28_STABLE
parents
3afbdcb2
c1c1dc7a
Changes
2
Hide whitespace changes
Inline
Side-by-side
mod/forum/discuss.php
View file @
e74ff55f
...
...
@@ -169,7 +169,7 @@ if ($move > 0 and confirm_sesskey()) {
forum_rss_delete_file
(
$forum
);
forum_rss_delete_file
(
$forumto
);
redirect
(
$return
.
'&move
d
=-1&sesskey='
.
sesskey
());
redirect
(
$return
.
'&move=-1&sesskey='
.
sesskey
());
}
$params
=
array
(
...
...
mod/forum/tests/behat/move_discussion.feature
0 → 100644
View file @
e74ff55f
@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'."
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment