Merge pull request #439 from crazyserver/MOBILE-1508

MOBILE-1508 messages: Go to message discussion from contacts tab

Author: jleyva

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() {

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>