mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 01:44:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-71944' of git://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2021-08-19 09:34:13 +08:00 committed by Ilya Tregubov
commit 84077e5263
2 changed files with 2 additions and 19 deletions

19
mod/wiki/pagelib.php

@ -1943,16 +1943,10 @@ class page_wiki_deletecomment extends page_wiki {
/**
* Prints the comment deletion confirmation form
*
* @param page $page The page whose version will be restored
* @param int $versionid The version to be restored
* @param bool $confirm If false, shows a yes/no confirmation page.
* If true, restores the old version and redirects the user to the 'view' tab.
*/
private function printconfirmdelete() {
global $OUTPUT;
$strdeletecheck = get_string('deletecommentcheck', 'wiki');
$strdeletecheckfull = get_string('deletecommentcheckfull', 'wiki');
//ask confirmation
@ -1960,18 +1954,7 @@ class page_wiki_deletecomment extends page_wiki {
$deleteurl = new moodle_url('/mod/wiki/instancecomments.php', $optionsyes);
$return = new moodle_url('/mod/wiki/comments.php', array('pageid'=>$this->page->id));
echo $OUTPUT->container_start();
echo html_writer::tag('p', $strdeletecheckfull);
echo $OUTPUT->container_start(false, 'wiki_deletecommentform');
echo '<form class="wiki_deletecomment_yes" action="' . $deleteurl . '" method="post" id="deletecomment">';
echo '<div><input type="submit" class="btn btn-secondary" name="confirmdeletecomment" value="'
. get_string('yes') . '" /></div>';
echo '</form>';
echo '<form class="wiki_deletecomment_no" action="' . $return . '" method="post">';
echo '<div><input type="submit" class="btn btn-secondary" name="norestore" value="' . get_string('no') . '" /></div>';
echo '</form>';
echo $OUTPUT->container_end();
echo $OUTPUT->container_end();
echo $OUTPUT->confirm($strdeletecheckfull, $deleteurl, $return);
}
}

2
mod/wiki/tests/behat/wiki_comments.feature

@ -49,7 +49,7 @@ Feature: Users can comment on wiki pages
And "Edit" "link" should exist in the "wiki-comments" "table"
And "Delete" "link" should exist in the "wiki-comments" "table"
And I click on "Delete" "link" in the "wiki-comments" "table"
And I press "Yes"
And I press "Continue"
And I should not see "student 1 updated comment"
@javascript