Commit 4d1ee8c0 authored by dockx thibault's avatar dockx thibault
Browse files

Merge branch...

Merge branch '57-orchestrator-new-endpoint-for-userreminder-allowing-to-send-notification-to-use-with-token-to' into 'dev'

Resolve "[Orchestrator] - New endpoint for userReminder allowing to send notification to use with token to extend their account longevity"

See merge request !61
2 merge requests!72Releasing Fusiondirectory Orchestrator 1.1,!61Resolve "[Orchestrator] - New endpoint for userReminder allowing to send notification to use with token to extend their account longevity"
Pipeline #30573 passed with stages
in 1 minute and 12 seconds
Showing with 769 additions and 2 deletions
+769 -2
...@@ -61,7 +61,6 @@ class TaskController ...@@ -61,7 +61,6 @@ class TaskController
break; break;
default: default:
// TODO: Default result in a non getProcess method found - could enhance below error report.
$this->respondMethodAllowed("GET, PATCH, DELETE"); $this->respondMethodAllowed("GET, PATCH, DELETE");
} }
$this->parseJsonResult($result); $this->parseJsonResult($result);
......
...@@ -38,6 +38,11 @@ class TaskGateway ...@@ -38,6 +38,11 @@ class TaskGateway
$this->unsetCountKeys($list_tasks); $this->unsetCountKeys($list_tasks);
break; break;
case "reminder":
$list_tasks = $this->getLdapTasks("(&(objectClass=fdTasksGranular)(fdtasksgranulartype=Reminder))");
$this->unsetCountKeys($list_tasks);
break;
case "removeSubTasks": case "removeSubTasks":
case "activateCyclicTasks": case "activateCyclicTasks":
// No need to get any parent tasks here, but to note break logic - we will return an array. // No need to get any parent tasks here, but to note break logic - we will return an array.
......
...@@ -56,7 +56,6 @@ class Mail implements EndpointInterface ...@@ -56,7 +56,6 @@ class Mail implements EndpointInterface
public function processMailTasks (array $tasks): array public function processMailTasks (array $tasks): array
{ {
$result = []; $result = [];
// DEBUGGING
$fdTasksConf = $this->getMailObjectConfiguration(); $fdTasksConf = $this->getMailObjectConfiguration();
$maxMailsConfig = $this->returnMaximumMailToBeSend($fdTasksConf); $maxMailsConfig = $this->returnMaximumMailToBeSend($fdTasksConf);
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment