Merge pull request #99 from e-ucm/littleltifix

Fixed undefined var (lti launch url) in the new interface
e-ucm · Oct 19, 2018 · 85c84f9 · 85c84f9
2 parents 057af2b + b33e9e7
commit 85c84f9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/app/public/js/controllers/class.js b/app/public/js/controllers/class.js
@@ -110,6 +110,9 @@ angular.module('classApp', ['ngStorage', 'services', 'ngAnimate', 'ngSanitize',
             };
 
             $attrs.$observe('classid', function() {
+                var myPrefix = $location.$$absUrl.split('/')[5];
+                $scope.lti.launch = $location.$$protocol + '://' + $location.$$host + ':' + $location.$$port +
+                    '/api/login/launch/' + myPrefix + '/' + CONSTANTS.PREFIX;
                 getClassInfo();
             });
 
@@ -171,17 +174,16 @@ angular.module('classApp', ['ngStorage', 'services', 'ngAnimate', 'ngSanitize',
             $scope.lti.key = '';
             $scope.lti.secret = '';
 
-            var myPrefix = $location.$$path.split('/')[3];
-            $scope.lti.launch = $location.$$protocol + '://' + $location.$$host + ':' + $location.$$port +
-                '/api/login/launch/' + myPrefix + '/' + CONSTANTS.PREFIX;
-
             $scope.createLtiKey = function () {
                 if ($scope.lti.secret) {
                     $http.post(CONSTANTS.PROXY + '/lti', {
                         secret: $scope.lti.secret,
                         classId: $scope.class._id
                     }).success(function (data) {
                         $scope.lti.key = data._id;
+                        var myPrefix = $location.$$absUrl.split('/')[5];
+                        $scope.lti.launch = $location.$$protocol + '://' + $location.$$host + ':' + $location.$$port +
+                            '/api/login/launch/' + myPrefix + '/' + CONSTANTS.PREFIX;
                     }).error(function (data, status) {
                         console.error('Error on get /lti' + JSON.stringify(data) + ', status: ' + status);
                     });