Merge pull request #366 from dpalou/MOBILE-1357

Mobile 1357

Author: jleyva

www/addons/grades/main.js

@@ -17,7 +17,8 @@ angular.module('mm.addons.grades', [])
 .constant('mmaGradesPriority', 400)
 .constant('mmaGradesViewGradesPriority', 400)
 
-.config(function($stateProvider, $mmUserDelegateProvider, $mmCoursesDelegateProvider, mmaGradesPriority, mmaGradesViewGradesPriority) {
+.config(function($stateProvider, $mmUserDelegateProvider, $mmCoursesDelegateProvider, $mmContentLinksDelegateProvider,
+            mmaGradesPriority, mmaGradesViewGradesPriority) {
 
     $stateProvider
 
@@ -41,4 +42,7 @@ angular.module('mm.addons.grades', [])
 
     // Register courses content plugin.
     $mmCoursesDelegateProvider.registerNavHandler('mmaGrades', '$mmaGradesHandlers.coursesNav', mmaGradesPriority);
+
+    // Register content links handler.
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaGrades', '$mmaGradesHandlers.linksHandler');
 });

www/addons/grades/services/handlers.js

@@ -21,7 +21,7 @@ angular.module('mm.addons.grades')
  * @ngdoc service
  * @name $mmaGradesHandlers
  */
-.factory('$mmaGradesHandlers', function($mmaGrades, $state, mmCoursesAccessMethods) {
+.factory('$mmaGradesHandlers', function($mmaGrades, $state, $mmUtil, $mmContentLinksHelper, mmCoursesAccessMethods) {
 
     var self = {};
 
@@ -155,5 +155,56 @@ angular.module('mm.addons.grades')
         return self;
     };
 
+    /**
+     * Content links handler.
+     *
+     * @module mm.addons.grades
+     * @ngdoc method
+     * @name $mmaGradesHandlers#linksHandler
+     */
+    self.linksHandler = function() {
+
+        var self = {};
+
+        /**
+         * Whether or not the handler is enabled for the site.
+         *
+         * @return {Boolean}
+         */
+        self.isEnabled = function() {
+            return $mmaGrades.isPluginEnabled();
+        };
+
+        /**
+         * Get actions to perform with the link.
+         *
+         * @param {String} url URL to treat.
+         * @return {Object[]}  List of actions. See {@link $mmContentLinksDelegate#registerLinkHandler}.
+         */
+        self.getActions = function(url) {
+            // Check it's a grade URL.
+            if (url.indexOf('/grade/report/user/index.php') > -1) {
+                var params = $mmUtil.extractUrlParams(url);
+                if (typeof params.id != 'undefined') {
+                    // Return actions.
+                    return [{
+                        message: 'mm.core.view',
+                        icon: 'ion-eye',
+                        action: function(siteId) {
+                            var stateParams = {
+                                course: {id: parseInt(params.id, 10)},
+                                userid: parseInt(params.userid, 10)
+                            };
+                            $mmContentLinksHelper.goInSite('site.grades', stateParams, siteId);
+                        }
+                    }];
+                }
+            }
+            return [];
+        };
+
+        return self;
+    };
+
     return self;
 });

www/addons/messages/controllers/discussion.js

@@ -23,7 +23,8 @@ angular.module('mm.addons.messages')
  */
 .controller('mmaMessagesDiscussionCtrl', function($scope, $stateParams, $mmApp, $mmaMessages, $mmSite, $timeout, $mmEvents, $window,
         $ionicScrollDelegate, mmUserProfileState, $mmUtil, mmaMessagesPollInterval, $interval, $log, $ionicHistory, $ionicPlatform,
-        mmCoreEventKeyboardShow, mmCoreEventKeyboardHide, mmaMessagesDiscussionLoadedEvent, mmaMessagesDiscussionLeftEvent) {
+        mmCoreEventKeyboardShow, mmCoreEventKeyboardHide, mmaMessagesDiscussionLoadedEvent, mmaMessagesDiscussionLeftEvent,
+        $mmUser) {
 
     $log = $log.getInstance('mmaMessagesDiscussionCtrl');
 
@@ -43,6 +44,13 @@ angular.module('mm.addons.messages')
 
     if (userFullname) {
         $scope.title = userFullname;
+    } else if (userId) {
+        // We don't have the fullname, try to get it.
+        $mmUser.getProfile(userId).then(function(user) {
+            if (!$scope.title) {
+                $scope.title = user.fullname;
+            }
+        });
     }
 
     // Disable the profile button if we're coming from a profile. It is safer to prevent forbid the access

www/addons/messages/main.js

@@ -24,7 +24,7 @@ angular.module('mm.addons.messages', ['mm.core'])
 .constant('mmaMessagesNewMessageEvent', 'mma-messages_new_message')
 
 .config(function($stateProvider, $mmUserDelegateProvider, $mmSideMenuDelegateProvider, mmaMessagesSendMessagePriority,
-            mmaMessagesAddContactPriority, mmaMessagesBlockContactPriority, mmaMessagesPriority) {
+            mmaMessagesAddContactPriority, mmaMessagesBlockContactPriority, mmaMessagesPriority, $mmContentLinksDelegateProvider) {
 
     $stateProvider
 
@@ -59,6 +59,9 @@ angular.module('mm.addons.messages', ['mm.core'])
     $mmUserDelegateProvider.registerProfileHandler('mmaMessages:sendMessage', '$mmaMessagesHandlers.sendMessage', mmaMessagesSendMessagePriority);
     $mmUserDelegateProvider.registerProfileHandler('mmaMessages:addContact', '$mmaMessagesHandlers.addContact', mmaMessagesAddContactPriority);
     $mmUserDelegateProvider.registerProfileHandler('mmaMessages:blockContact', '$mmaMessagesHandlers.blockContact', mmaMessagesBlockContactPriority);
+
+    // Register content links handler.
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaMessages', '$mmaMessagesHandlers.linksHandler');
 })
 
 .run(function($mmaMessages, $mmEvents, $state, $mmAddonManager, $mmUtil, mmCoreEventLogin) {

www/addons/messages/services/handlers.js

@@ -23,7 +23,7 @@ angular.module('mm.addons.messages')
  * @ngdoc service
  * @name $mmaMessagesHandlers
  */
-.factory('$mmaMessagesHandlers', function($log, $mmaMessages, $mmSite, $state, $mmUtil) {
+.factory('$mmaMessagesHandlers', function($log, $mmaMessages, $mmSite, $state, $mmUtil, $mmContentLinksHelper) {
     $log = $log.getInstance('$mmaMessagesHandlers');
 
     var self = {};
@@ -281,5 +281,80 @@ angular.module('mm.addons.messages')
         return self;
     };
 
+    /**
+     * Content links handler.
+     *
+     * @module mm.addons.messages
+     * @ngdoc method
+     * @name $mmaMessagesHandlers#linksHandler
+     */
+    self.linksHandler = function() {
+
+        var self = {};
+
+        /**
+         * Whether or not the handler is enabled for the site.
+         *
+         * @return {Boolean}
+         */
+        self.isEnabled = function() {
+            return $mmaMessages.isPluginEnabled();
+        };
+
+        /**
+         * Get actions to perform with the link.
+         *
+         * @param {String} url URL to treat.
+         * @return {Object[]}  List of actions. See {@link $mmContentLinksDelegate#registerLinkHandler}.
+         */
+        self.getActions = function(url) {
+            // Check it's a messages URL.
+            if (url.indexOf('/message/index.php') > -1) {
+                var params = $mmUtil.extractUrlParams(url);
+                // Return actions.
+                return [{
+                    message: 'mm.core.view',
+                    icon: 'ion-eye',
+                    action: function(siteId) {
+                        var stateName,
+                            stateParams;
+
+                        if (typeof params.user1 != 'undefined' && typeof params.user2 != 'undefined') {
+                            // Check if the current user is in the conversation.
+                            if ($mmSite.getUserId() == params.user1) {
+                                stateName = 'site.messages-discussion';
+                                stateParams = {userId: parseInt(params.user2, 10)};
+                            } else if ($mmSite.getUserId() == params.user2) {
+                                stateName = 'site.messages-discussion';
+                                stateParams = {userId: parseInt(params.user1, 10)};
+                            } else {
+                                // He isn't, open in browser.
+                                $mmUtil.openInBrowser(url);
+                                return;
+                            }
+                        } else if (typeof params.id != 'undefined') {
+                            stateName = 'site.messages-discussion';
+                            stateParams = {userId: parseInt(params.id, 10)};
+                        }
+
+                        if (!stateName) {
+                            // Go to messaging index page. We use redirect state to view the side menu.
+                            $state.go('redirect', {
+                                siteid: siteId,
+                                state: 'site.messages',
+                                params: {}
+                            });
+                        } else {
+                            $mmContentLinksHelper.goInSite(stateName, stateParams, siteId);
+                        }
+                    }
+                }];
+            }
+            return [];
+        };
+
+        return self;
+    };
+
     return self;
 });

www/addons/participants/main.js

@@ -17,7 +17,7 @@ angular.module('mm.addons.participants', [])
 .constant('mmaParticipantsListLimit', 50) // Max of participants to retrieve in each WS call.
 .constant('mmaParticipantsPriority', 600)
 
-.config(function($stateProvider, $mmCoursesDelegateProvider, mmaParticipantsPriority) {
+.config(function($stateProvider, $mmCoursesDelegateProvider, $mmContentLinksDelegateProvider, mmaParticipantsPriority) {
 
     $stateProvider
         .state('site.participants', {
@@ -33,6 +33,10 @@ angular.module('mm.addons.participants', [])
             }
         });
 
-    $mmCoursesDelegateProvider.registerNavHandler('mmaParticipants', '$mmaParticipantsCoursesNavHandler', mmaParticipantsPriority);
+    $mmCoursesDelegateProvider.registerNavHandler('mmaParticipants', '$mmaParticipantsHandlers.coursesNavHandler',
+                mmaParticipantsPriority);
+
+    // Register content links handler.
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaParticipants', '$mmaParticipantsHandlers.linksHandler');
 
 });