Verified Commit ff1773d7 authored by dockx thibault's avatar dockx thibault
Browse files

:sparkles: Feat(Tasks) - Adds proper scheduling and user selection

Add users selection for mail task as well as schedule within
generic page of tasks creation.
Showing with 31 additions and 3 deletions
+31 -3
...@@ -293,6 +293,19 @@ attributetype ( 1.3.6.1.4.1.38414.89.1.1 NAME 'fdTasksMailObject' ...@@ -293,6 +293,19 @@ attributetype ( 1.3.6.1.4.1.38414.89.1.1 NAME 'fdTasksMailObject'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE ) SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.89.1.2 NAME 'fdTasksSchedule'
DESC 'Scheduling of the Task - required processed date'
EQUALITY generalizedTimeMatch
ORDERING generalizedTimeOrderingMatch
SINGLE-VALUE
SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
attributetype ( 1.3.6.1.4.1.38414.89.1.3 NAME 'fdTasksMailUsers'
DESC 'Fusion Directory - Tasks Mail Users Recipient'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
##### Classes ##### ##### Classes #####
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY
...@@ -380,10 +393,10 @@ objectclass ( 1.3.6.1.4.1.38414.88.2.5 NAME 'fdMailTemplateInvitations' ...@@ -380,10 +393,10 @@ objectclass ( 1.3.6.1.4.1.38414.88.2.5 NAME 'fdMailTemplateInvitations'
objectclass (1.3.6.1.4.1.38414.89.2.1 NAME 'fdTasks' objectclass (1.3.6.1.4.1.38414.89.2.1 NAME 'fdTasks'
DESC 'FusionDirectory - Tasks objects' DESC 'FusionDirectory - Tasks objects'
MUST ( cn ) MUST ( cn )
MAY ( ) ) MAY ( fdTasksSchedule ) )
objectclass (1.3.6.1.4.1.38414.89.2.2 NAME 'fdTasksMail' objectclass (1.3.6.1.4.1.38414.89.2.2 NAME 'fdTasksMail'
DESC 'FusionDirectory - Tasks objects Mail' DESC 'FusionDirectory - Tasks objects Mail'
SUP top AUXILIARY SUP top AUXILIARY
MUST ( cn ) MUST ( cn )
MAY ( fdTasksMailObject ) ) MAY ( fdTasksMailObject $ fdTasksMailUsers) )
...@@ -51,6 +51,11 @@ class tasks extends simplePlugin ...@@ -51,6 +51,11 @@ class tasks extends simplePlugin
_('Task Name'), _('Name for this task'), _('Task Name'), _('Name for this task'),
'cn', TRUE 'cn', TRUE
), ),
new GeneralizedTimeDateAttribute(
_('Task Schedule'), _('Date when this task is required to be processed'),
'fdTasksSchedule', FALSE,
''
),
] ]
], ],
]; ];
......
...@@ -56,6 +56,16 @@ class tasksMail extends simplePlugin ...@@ -56,6 +56,16 @@ class tasksMail extends simplePlugin
), ),
] ]
], ],
'UserGroupSelection' => [
'name' => _('Users and/or Groups'),
'attrs' => [
new GroupMembersAttribute(
'', _('Select Users/Groups'),
'fdTasksMailUsers', TRUE,
[], 'cn'
)
]
],
]; ];
} }
...@@ -64,7 +74,7 @@ class tasksMail extends simplePlugin ...@@ -64,7 +74,7 @@ class tasksMail extends simplePlugin
global $config; global $config;
parent::__construct($dn, $object, $parent, $mainTab); parent::__construct($dn, $object, $parent, $mainTab);
//Search within LDAP and retrieve all mail objects //Search within LDAP and retrieve all mail objects for current base.
$ldap = $config->get_ldap_link(); $ldap = $config->get_ldap_link();
$ldap->cd($config->current['BASE']); $ldap->cd($config->current['BASE']);
$ldap->search('(&(objectClass=fdMailTemplate))', ['cn']); $ldap->search('(&(objectClass=fdMailTemplate))', ['cn']);
......
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