MDL-46215 mod_forum: Only add text on discussion view

Do not show the status text in the thread list.
moodle · Oct 28, 2014 · 79b4fb1 · 79b4fb1
1 parent c5258df
commit 79b4fb1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
@@ -3791,6 +3791,7 @@ function forum_get_discussion_subscription_icon($forum, $discussionid, $returnur
                 'class' => 'discussiontoggle iconsmall',
                 'data-forumid' => $forum->id,
                 'data-discussionid' => $discussionid,
+                'data-includetext' => $includetext,
         ));
     } else {
         $o .= html_writer::link($subscriptionlink,
@@ -3800,6 +3801,7 @@ function forum_get_discussion_subscription_icon($forum, $discussionid, $returnur
                 'class' => 'discussiontoggle iconsmall',
                 'data-forumid' => $forum->id,
                 'data-discussionid' => $discussionid,
+                'data-includetext' => $includetext,
         ));
     }
 

diff --git a/mod/forum/subscribe_ajax.php b/mod/forum/subscribe_ajax.php
@@ -29,6 +29,7 @@
 $forumid        = required_param('forumid', PARAM_INT);             // The forum to subscribe or unsubscribe.
 $discussionid   = optional_param('discussionid', null, PARAM_INT);  // The discussionid to subscribe.
 $sesskey        = optional_param('sesskey', null, PARAM_RAW);
+$includetext    = optional_param('includetext', false, PARAM_BOOL);
 
 $forum          = $DB->get_record('forum', array('id' => $forumid), '*', MUST_EXIST);
 $course         = $DB->get_record('course', array('id' => $forum->course), '*', MUST_EXIST);
@@ -56,6 +57,6 @@
 }
 
 // Now return the updated subscription icon.
-$return->icon = forum_get_discussion_subscription_icon($forum, $discussion->id, null, true);
+$return->icon = forum_get_discussion_subscription_icon($forum, $discussion->id, null, $includetext);
 echo json_encode($return);
 die;
diff --git a/...ui/build/moodle-mod_forum-subscriptiontoggle/moodle-mod_forum-subscriptiontoggle-debug.js b/...ui/build/moodle-mod_forum-subscriptiontoggle/moodle-mod_forum-subscriptiontoggle-debug.js
@@ -48,7 +48,8 @@ Y.extend(SubscriptionToggle, Y.Base, {
             data: {
                 sesskey: M.cfg.sesskey,
                 forumid: clickedLink.getData('forumid'),
-                discussionid: clickedLink.getData('discussionid')
+                discussionid: clickedLink.getData('discussionid'),
+                includetext: clickedLink.getData('includetext')
             },
             context: this,
             'arguments': {

diff --git a/.../yui/build/moodle-mod_forum-subscriptiontoggle/moodle-mod_forum-subscriptiontoggle-min.js b/.../yui/build/moodle-mod_forum-subscriptiontoggle/moodle-mod_forum-subscriptiontoggle-min.js
diff --git a/...orum/yui/build/moodle-mod_forum-subscriptiontoggle/moodle-mod_forum-subscriptiontoggle.js b/...orum/yui/build/moodle-mod_forum-subscriptiontoggle/moodle-mod_forum-subscriptiontoggle.js
@@ -48,7 +48,8 @@ Y.extend(SubscriptionToggle, Y.Base, {
             data: {
                 sesskey: M.cfg.sesskey,
                 forumid: clickedLink.getData('forumid'),
-                discussionid: clickedLink.getData('discussionid')
+                discussionid: clickedLink.getData('discussionid'),
+                includetext: clickedLink.getData('includetext')
             },
             context: this,
             'arguments': {

diff --git a/mod/forum/yui/src/subscriptiontoggle/js/toggle.js b/mod/forum/yui/src/subscriptiontoggle/js/toggle.js
@@ -46,7 +46,8 @@ Y.extend(SubscriptionToggle, Y.Base, {
             data: {
                 sesskey: M.cfg.sesskey,
                 forumid: clickedLink.getData('forumid'),
-                discussionid: clickedLink.getData('discussionid')
+                discussionid: clickedLink.getData('discussionid'),
+                includetext: clickedLink.getData('includetext')
             },
             context: this,
             'arguments': {