From 014fa602cb9f6169dfebfdef4b66ea161b001292 Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Sun, 2 Aug 2015 18:15:51 +0300 Subject: [PATCH] Fix to task --- SE_API/Email_Utils.py | 2 +- templates/js/controllers/taskController.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SE_API/Email_Utils.py b/SE_API/Email_Utils.py index 086a025..93bc34b 100644 --- a/SE_API/Email_Utils.py +++ b/SE_API/Email_Utils.py @@ -167,7 +167,7 @@ def send_task_reminder( email, name, task_name, course_name):

Dear """+name+""":

- +

diff --git a/templates/js/controllers/taskController.js b/templates/js/controllers/taskController.js index e29a493..04f8e80 100644 --- a/templates/js/controllers/taskController.js +++ b/templates/js/controllers/taskController.js @@ -80,14 +80,15 @@ angular.module('SeHub') .content('Your Task Was Successfully Submitted!') .ariaLabel('ddd') .ok('GoTo My Submitted Task') - .then(function(dd){ + .targetEvent(event) + + ).then(function(){ if($scope.task.isPersonal) $location.path('/tasks/overview/'+taskId+'/'+groupId+'/'+groupId); else $location.path('/tasks/overview/'+taskId+'/'+groupId+'/'+groupId); - }) - .targetEvent(event) - ); + }); + return; }) }