Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
dee09a2d
Verified
Commit
dee09a2d
authored
1 year ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
Feat(CORE) - SubTasks are created
Subtasks are now created.
parent
64562536
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plugins/configuration/tasks/class_tasksGranular.inc
+1
-2
plugins/configuration/tasks/class_tasksGranular.inc
plugins/configuration/tasks/class_tasksLifeCycle.inc
+7
-3
plugins/configuration/tasks/class_tasksLifeCycle.inc
with
8 additions
and
5 deletions
+8
-5
plugins/configuration/tasks/class_tasksGranular.inc
+
1
−
2
View file @
dee09a2d
...
@@ -26,7 +26,7 @@ class tasksGranular extends simplePlugin
...
@@ -26,7 +26,7 @@ class tasksGranular extends simplePlugin
{
{
return
[
return
[
'plShortName'
=>
_
(
'Tasks Granular'
),
'plShortName'
=>
_
(
'Tasks Granular'
),
'plDescription'
=>
_
(
'Granular tasks mangement allowing details reports'
),
'plDescription'
=>
_
(
'Granular tasks man
a
gement allowing details reports'
),
'plObjectClass'
=>
[
'fdTasksGranular'
],
'plObjectClass'
=>
[
'fdTasksGranular'
],
'plFilter'
=>
'(objectClass=fdTasksGranular)'
,
'plFilter'
=>
'(objectClass=fdTasksGranular)'
,
'plPriority'
=>
41
,
'plPriority'
=>
41
,
...
@@ -86,7 +86,6 @@ class tasksGranular extends simplePlugin
...
@@ -86,7 +86,6 @@ class tasksGranular extends simplePlugin
function
__construct
(
$dn
=
NULL
,
$object
=
NULL
,
$parent
=
NULL
,
$mainTab
=
FALSE
)
function
__construct
(
$dn
=
NULL
,
$object
=
NULL
,
$parent
=
NULL
,
$mainTab
=
FALSE
)
{
{
global
$config
;
parent
::
__construct
(
$dn
,
$object
,
$parent
,
$mainTab
);
parent
::
__construct
(
$dn
,
$object
,
$parent
,
$mainTab
);
}
}
...
...
This diff is collapsed.
Click to expand it.
plugins/configuration/tasks/class_tasksLifeCycle.inc
+
7
−
3
View file @
dee09a2d
...
@@ -195,7 +195,7 @@ class tasksLifeCycle extends simplePlugin
...
@@ -195,7 +195,7 @@ class tasksLifeCycle extends simplePlugin
}
}
}
}
$this
->
attributesAccess
[
'fdTasks
EmailsFrom
DN'
]
->
setValue
(
array_values
(
$membersAndGroups
));
$this
->
attributesAccess
[
'fdTasks
LifeCycleListOf
DN'
]
->
setValue
(
array_values
(
$membersAndGroups
));
}
}
}
}
...
@@ -236,7 +236,7 @@ class tasksLifeCycle extends simplePlugin
...
@@ -236,7 +236,7 @@ class tasksLifeCycle extends simplePlugin
}
}
if
(
!
empty
(
$subTasks
))
{
if
(
!
empty
(
$subTasks
))
{
// Recuperate members
email
from the ldap search.
// Recuperate members
DN
from the ldap search.
foreach
(
$subTasks
as
$subTask
)
{
foreach
(
$subTasks
as
$subTask
)
{
$membersDN
[]
=
$subTask
[
'fdTasksGranularDN'
][
0
];
$membersDN
[]
=
$subTask
[
'fdTasksGranularDN'
][
0
];
}
}
...
@@ -263,7 +263,7 @@ class tasksLifeCycle extends simplePlugin
...
@@ -263,7 +263,7 @@ class tasksLifeCycle extends simplePlugin
$values
[
'tasksGranular'
]
=
[
$values
[
'tasksGranular'
]
=
[
"cn"
=>
$subTaskName
,
"cn"
=>
$subTaskName
,
"fdTasksGranularType"
=>
'
Mail Object
'
,
"fdTasksGranularType"
=>
'
Life Cycle
'
,
"fdTasksGranularMaster"
=>
$this
->
dn
,
"fdTasksGranularMaster"
=>
$this
->
dn
,
"fdTasksGranularDN"
=>
$dn
,
"fdTasksGranularDN"
=>
$dn
,
"fdTasksGranularSchedule"
=>
$schedule
,
"fdTasksGranularSchedule"
=>
$schedule
,
...
@@ -297,6 +297,10 @@ class tasksLifeCycle extends simplePlugin
...
@@ -297,6 +297,10 @@ class tasksLifeCycle extends simplePlugin
public
function
update
():
bool
public
function
update
():
bool
{
{
parent
::
update
();
parent
::
update
();
// Take the list of DN based on the groups or members list selected and filled the related attributes
$this
->
getListOfDN
();
return
TRUE
;
return
TRUE
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets