From ef735275deff78006a38175f6ae6595178e04670 Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Mon, 8 Aug 2016 12:15:23 +0800
Subject: [PATCH] MDL-54687 core_message: removed 'conversationsselected'
 variable

---
 message/classes/api.php                       |  2 +-
 .../classes/output/messagearea/contacts.php   | 10 +----
 message/externallib.php                       |  2 -
 .../message_area_contacts_area.mustache       | 45 ++-----------------
 4 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/message/classes/api.php b/message/classes/api.php
index da0f61abc81..3f1eb8c05ac 100644
--- a/message/classes/api.php
+++ b/message/classes/api.php
@@ -81,7 +81,7 @@ class api {
             }
         }
 
-        return new \core_message\output\messagearea\contacts($userid, 0, $arrcontacts, false);
+        return new \core_message\output\messagearea\contacts($userid, 0, $arrcontacts);
     }
 
     /**
diff --git a/message/classes/output/messagearea/contacts.php b/message/classes/output/messagearea/contacts.php
index 5b946253f0a..f01df4ae0e7 100644
--- a/message/classes/output/messagearea/contacts.php
+++ b/message/classes/output/messagearea/contacts.php
@@ -51,24 +51,17 @@ class contacts implements templatable, renderable {
      */
     protected $contacts;
 
-    /**
-     * Determines if the conversations have been selected.
-     */
-    protected $conversationsselected;
-
     /**
      * Constructor.
      *
      * @param int $userid The id of the user the contacts belong to
      * @param int $otheruserid The id of the user we are viewing
      * @param \core_message\output\messagearea\contact[] $contacts
-     * @param bool $conversationsselected
      */
-    public function __construct($userid, $otheruserid, $contacts, $conversationsselected = true) {
+    public function __construct($userid, $otheruserid, $contacts) {
         $this->userid = $userid;
         $this->otheruserid = $otheruserid;
         $this->contacts = $contacts;
-        $this->conversationsselected = $conversationsselected;
     }
 
     public function export_for_template(\renderer_base $output) {
@@ -84,7 +77,6 @@ class contacts implements templatable, renderable {
             }
             $data->contacts[] = $contactdata;
         }
-        $data->conversationsselected = $this->conversationsselected;
 
         return $data;
     }
diff --git a/message/externallib.php b/message/externallib.php
index d48470b30cb..c38c553dfb2 100644
--- a/message/externallib.php
+++ b/message/externallib.php
@@ -475,8 +475,6 @@ class core_message_external extends external_api {
         return new external_function_parameters(
             array(
                 'userid' => new external_value(PARAM_INT, 'The id of the user who we are viewing conversations for'),
-                'conversationsselected' => new external_value(PARAM_BOOL, 'Determines if conversations were selected,
-                    otherwise contacts were'),
                 'contacts' => new external_multiple_structure(
                     new external_single_structure(
                         array(
diff --git a/message/templates/message_area_contacts_area.mustache b/message/templates/message_area_contacts_area.mustache
index 6b941d82e88..ef11da4e336 100644
--- a/message/templates/message_area_contacts_area.mustache
+++ b/message/templates/message_area_contacts_area.mustache
@@ -4,54 +4,17 @@
         <input type="text" id="filter{{uniqid}}" placeholder="{{#str}}search{{/str}}" value="{{search}}">
     </form>
 </div>
-<div class="contacts"
-    data-region="contacts"
-    data-region-content="{{#conversationsselected}}conversations{{/conversationsselected}}{{^conversationsselected}}contacts{{/conversationsselected}}"
-    role="tabpanel"
-    {{#conversationsselected}}id="conversations-tab-panel"{{/conversationsselected}}
-    {{^conversationsselected}}id="contacts-tab-panel"{{/conversationsselected}}>
-
+<div class="contacts" data-region="contacts" data-region-content="conversations" role="tabpanel" id="conversations-tab-panel">
     {{> core_message/message_area_contacts }}
 </div>
 {{! Hidden div to load the other tabs items in via JS when appropriate. }}
-<div class="contacts"
-    data-region="contacts"
-    data-region-content="{{#conversationsselected}}contacts{{/conversationsselected}}{{^conversationsselected}}conversations{{/conversationsselected}}"
-    style="display:none;"
-    role="tabpanel"
-    {{#conversationsselected}}id="contacts-tab-panel"{{/conversationsselected}}
-    {{^conversationsselected}}id="conversations-tab-panel"{{/conversationsselected}}>
-</div>
+<div class="contacts" data-region="contacts" data-region-content="contacts" style="display:none;" role="tabpanel" id="contacts-tab-panel"></div>
 <div class="row-fluid tabs">
-    <div class="span6 tab tabconversations {{#conversationsselected}}selected{{/conversationsselected}}"
-        data-action="conversations-view"
-        role="tab"
-        aria-controls="conversations-tab-panel"
-        {{#conversationsselected}}
-            aria-selected="true"
-            tabindex="0"
-        {{/conversationsselected}}
-        {{^conversationsselected}}
-            aria-selected="false"
-            tabindex="-1"
-        {{/conversationsselected}}>
-
+    <div class="span6 tab tabconversations selected" data-action="conversations-view" role="tab" aria-controls="conversations-tab-panel" aria-selected="true" tabindex="0">
         <div>{{#pix}}t/message, moodle{{/pix}}</div>
         <div>{{#str}}conversations, message{{/str}}</div>
     </div>
-    <div class="span6 tab tabcontacts {{^conversationsselected}}selected{{/conversationsselected}}"
-        data-action="contacts-view"
-        role="tab"
-        aria-controls="contacts-tab-panel"
-        {{#conversationsselected}}
-            aria-selected="false"
-            tabindex="-1"
-        {{/conversationsselected}}
-        {{^conversationsselected}}
-            aria-selected="true"
-            tabindex="0"
-        {{/conversationsselected}}>
-
+    <div class="span6 tab tabcontacts" data-action="contacts-view" role="tab" aria-controls="contacts-tab-panel" aria-selected="false" tabindex="-1">
         <div>{{#pix}}i/cohort, moodle{{/pix}}</div>
         <div>{{#str}}contacts, message{{/str}}</div>
     </div>