Merge pull request #280 from Leantime/bugfixes-20104

Bugfixes 20104
Leantime · May 26, 2020 · 78ccaf7 · 78ccaf7
2 parents a0ad454 + f96f210
commit 78ccaf7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/config/settings.php b/config/settings.php
@@ -15,7 +15,7 @@ class settings {
 	 */
 	private $debug = 0;
 
-	public $appVersion = "2.1.3";
+	public $appVersion = "2.1.4";
 
     public $dbVersion = "2.1.4";
 

diff --git a/src/domain/projects/controllers/class.showProject.php b/src/domain/projects/controllers/class.showProject.php
@@ -4,7 +4,6 @@
 
     use leantime\core;
     use leantime\domain\repositories;
-    use JoliCode;
     use leantime\domain\services;
 
     class showProject
@@ -294,7 +293,7 @@ public function run()
 
                     $comments->deleteComment($commentId);
 
-                    $this->setNotification($this->language->__("notifications.comment_deleted"), "success");
+                    $tpl->setNotification($this->language->__("notifications.comment_deleted"), "success");
 
                 }
                 //Timesheets

diff --git a/src/domain/timesheets/controllers/class.showMy.php b/src/domain/timesheets/controllers/class.showMy.php
@@ -68,7 +68,7 @@ public function run()
             $tpl->assign('actKind', $kind);
             $tpl->assign('kind', $timesheetsRepo->kind);
             $tpl->assign('helper', $helper);
-            $tpl->assign('allProjects', $projects->getUserProjects());
+            $tpl->assign('allProjects', $projects->getUserProjects($_SESSION["userdata"]["id"]));
             $tpl->assign('allTickets', $tickets->getUsersTickets($_SESSION["userdata"]["id"], -1));
             $tpl->assign('allTimesheets', $myTimesheets);
             $tpl->display('timesheets.showMy');