Merge branch 'master' into fix/163_fix-project-search

mtierltd · web-flow · commit db9eac83b18a · 2022-07-04T08:58:24.000+02:00
diff --git a/js/src/projects.js b/js/src/projects.js
@@ -216,7 +216,7 @@ require('../../css/piklor.css');
                     "requesttoken" : oc_requesttoken,
                    
                   },
-                  url:  OC.generateUrl('/ocs/v2.php/cloud/users/details?offset=0&search='),
+                  url: OC.generateUrl('/ocs/v2.php/cloud/users/details'),
                   formatNoMatches: function() {
                     return '';
                 },
@@ -434,7 +434,7 @@ require('../../css/piklor.css');
                     
                   });
 
-                  $.ajax('/ocs/v2.php/cloud/users/details?offset=0&search=', {
+                  $.ajax(OC.generateUrl('/ocs/v2.php/cloud/users/details'), {
                     dataType: "json",
                     headers: {
                       "requesttoken" : oc_requesttoken,
diff --git a/lib/Controller/AjaxController.php b/lib/Controller/AjaxController.php
@@ -456,6 +456,7 @@ public function addWorkInterval() {
 		 }
 
 		$this->workIntervalMapper->insert($wi);
+		$running = $this->workIntervalMapper->findAllRunning($this->userId);
 
 		return new JSONResponse(["WorkIntervals" => json_decode(json_encode($running), true)]);
 	}

Original file line number	Diff line number	Diff line change
`@@ -456,6 +456,7 @@ public function addWorkInterval() {`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`$this->workIntervalMapper->insert($wi);`
	`459`	`+ $running = $this->workIntervalMapper->findAllRunning($this->userId);`
`459`	`460`
`460`	`461`	`return new JSONResponse(["WorkIntervals" => json_decode(json_encode($running), true)]);`
`461`	`462`	`}`