From 0e07b63ad27f49057cb92a47bec64f7a30e3e038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 1 Apr 2016 14:45:27 +0200
Subject: [PATCH] MOBILE-1508 messages: Go to message discussion from contacts
 tab

---
 www/addons/messages/controllers/index.js    | 2 +-
 www/addons/messages/templates/contacts.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/addons/messages/controllers/index.js b/www/addons/messages/controllers/index.js
index a2e92bc6e88..3de6bb3d29c 100644
--- a/www/addons/messages/controllers/index.js
+++ b/www/addons/messages/controllers/index.js
@@ -25,7 +25,7 @@ angular.module('mm.addons.messages')
             mmaMessagesDiscussionLoadedEvent, mmaMessagesDiscussionLeftEvent) {
     // Listen for discussion loaded event to show user profile link in tablet view.
     var obsLoaded = $mmEvents.on(mmaMessagesDiscussionLoadedEvent, function(userId) {
-        if ($ionicPlatform.isTablet() && $ionicTabsDelegate.selectedIndex() === 0) {
+        if ($ionicPlatform.isTablet()) {
             // A discussion was loaded in tablet, get the user image and show the button to the profile.
             $scope.userId = userId;
             $mmUser.getProfile(userId, undefined, true).catch(function() {
diff --git a/www/addons/messages/templates/contacts.html b/www/addons/messages/templates/contacts.html
index af6b481b722..3ab74df8337 100644
--- a/www/addons/messages/templates/contacts.html
+++ b/www/addons/messages/templates/contacts.html
@@ -25,7 +25,7 @@ <h2>{{ 'mma.messages.type_' + contactType | translate }}</h2>
                     </button>
                 </ion-item>
 
-                <a ng-repeat="contact in contacts[contactType] | orderBy:'fullname' track by $index" ng-if="contact.profileimageurl || contact.profileimageurlsmall" class="item item-avatar" mm-split-view-link="{{userStateName}}({userid: contact.id})" title="{{contact.fullname}}"> <!-- Don't show deleted users -->
+                <a ng-repeat="contact in contacts[contactType] | orderBy:'fullname' track by $index" ng-if="contact.profileimageurl || contact.profileimageurlsmall" class="item item-avatar" mm-split-view-link="site.messages-discussion({userId: contact.id})" title="{{contact.fullname}}"> <!-- Don't show deleted users -->
                     <img ng-src="{{ contact.profileimageurl || contact.profileimageurlsmall }}" alt="{{ 'mm.core.pictureof' | translate:{$a: contact.fullname} }}" role="presentation" mm-external-content >
                     <p class="item-heading">{{ contact.fullname }}</p>
                 </a>