INT-18599: Implements formatting changeover when using the advanced editor

Author: fabianbatioja

post.php

@@ -39,6 +39,9 @@
 $messagecontent = optional_param('msgcontent', '', PARAM_TEXT);
 $subjectcontent = optional_param('subcontent', '', PARAM_TEXT);
 
+$prefilledpost = optional_param('post', '', PARAM_TEXT);
+$prefilledpostformat = optional_param('postformat', FORMAT_MOODLE, PARAM_INT);
+
 $PAGE->set_url('/mod/hsuforum/post.php', array(
     'reply' => $reply,
     'forum' => $forum,
@@ -219,6 +222,14 @@
         print_error("activityiscurrentlyhidden");
     }
 
+    $preferredformat = editors_get_preferred_format();
+    // Only if there are prefilled contents coming.
+    if (!empty($messagecontent)) {
+        // If the prefilled post is not HTML and the preferred format is HTML, convert to it.
+        if ($prefilledpostformat != FORMAT_HTML and $preferredformat == FORMAT_HTML) {
+            $messagecontent = format_text($messagecontent, $prefilledpostformat, ['context' => $modcontext]);
+        }
+    }
     // Load up the $post variable.
 
     $post = new stdClass();
@@ -231,6 +242,7 @@
     $post->subject     = $parent->subject;
     $post->userid      = $USER->id;
     $post->message     = '';
+    $post->messageformat  = '';
 
     $post->groupid = ($discussion->groupid == -1) ? 0 : $discussion->groupid;
 

styles.css

@@ -1011,6 +1011,11 @@ body:not(.theme_snap) li.modtype_hsuforum .afterlink .hsuforum-recent .snap-medi
     float: left;
 }
 
+body:not(.theme_snap) li.modtype_hsuforum .activity-item .activity-basis .activity-info {
+    padding-top: 1rem;
+    padding-left: 0;
+}
+
 div.hsuforum-thread-header > div.hsuforum-thread-meta > div.hsuforum-thread-participants > span,
 div.hsuforum-post-body > .hsuforum-post-byline > span {
     width: 2rem;

tests/behat/advanced_editor_pass_data_to_new_page.feature

@@ -62,10 +62,12 @@ Feature: Users see their typed information in the advanced editor view when clic
     And I follow "Test forum name"
     And I follow "Test discussion 1 to be cancelled"
     And I wait until the page is ready
+    And I set editable div ".hsuforum-textarea" "css_element" to "Test discussion 1 to be cancelled description"
     And I click on ".hsuforum-post.depth0 .hsuforum-reply-link" "css_element"
     Then I should see "Reply to Student 1"
-    And I set editable div ".hsuforum-post.depth0 .hsuforum-textarea" "css_element" to "This is a reply"
+    And I set editable div with break line ".hsuforum-post.depth0 .hsuforum-textarea" "css_element" to "This is a reply \n This is a new line"
     And I click on ".hsuforum-post.depth0 .hsuforum-use-advanced" "css_element"
     And I wait until the page is ready
+    And ".text_to_html br" "css_element" should exist
     And I should see "Your reply"
     And I set the field with xpath "//*[@id='id_messageeditable']" to "This is a reply"

tests/behat/behat_mod_hsuforum.php

@@ -137,6 +137,25 @@ public function i_set_editable_div_to ($ellocator, $selectortype, $value) {
         $div->setValue($value);
     }
 
+    /**
+     * Set regular field (not moodle form field) to a specific value.
+     *
+     * @Given /^I set editable div with break line "([^"]*)" "([^"]*)" to "([^"]*)"$/
+     * @param string $ellocator
+     * @param string $selectortype
+     * @param string $value
+     * @throws \Behat\Mink\Exception\ElementException
+     */
+    public function i_set_editable_div_with_line_break($ellocator, $selectortype, $value) {
+        // Getting Mink selector and locator.
+        list($selector, $locator) = $this->transform_selector($selectortype, $ellocator);
+
+        // Will throw an ElementNotFoundException if it does not exist.
+        $div = $this->find($selector, $locator);
+        $value = str_replace('\n', behat_keys::ENTER, $value);
+        $div->setValue($value);
+    }
+
     /**
      * Sets the specified value to the field.
      *

yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article-debug.js

@@ -761,9 +761,10 @@ Y.extend(FORM, Y.Base,
             var message = Y.one('div[id^=editor-target-container-]');
             var subject = Y.one('input[name=subject]');
             var link = e.target.getAttribute('href');
+            var strmessage = encodeURIComponent(message.get('innerText'));
             if (!link.includes('post.php?edit')) {
                 e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
-                    message.get('textContent') + '&subcontent=' + subject.get('value'));
+                    strmessage + '&subcontent=' + subject.get('value'));
             }
         },
         /**

yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article-min.js

@@ -755,9 +755,10 @@ Y.extend(FORM, Y.Base,
             var message = Y.one('div[id^=editor-target-container-]');
             var subject = Y.one('input[name=subject]');
             var link = e.target.getAttribute('href');
+            var strmessage = encodeURIComponent(message.get('innerText'));
             if (!link.includes('post.php?edit')) {
                 e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
-                    message.get('textContent') + '&subcontent=' + subject.get('value'));
+                    strmessage + '&subcontent=' + subject.get('value'));
             }
         },
         /**

yui/build/moodle-mod_hsuforum-article/moodle-mod_hsuforum-article.js

@@ -259,9 +259,10 @@ Y.extend(FORM, Y.Base,
             var message = Y.one('div[id^=editor-target-container-]');
             var subject = Y.one('input[name=subject]');
             var link = e.target.getAttribute('href');
+            var strmessage = encodeURIComponent(message.get('innerText'));
             if (!link.includes('post.php?edit')) {
                 e.target.setAttribute('href', e.target.getAttribute('href') + '&msgcontent=' +
-                    message.get('textContent') + '&subcontent=' + subject.get('value'));
+                    strmessage + '&subcontent=' + subject.get('value'));
             }
         },
         /**