Commit 1b6ff12b authored by dockx thibault's avatar dockx thibault
Browse files

Merge branch '6307-reminder-remove-manager-boolean-as-forward-to-renders-this-redundant' into 'dev'

Resolve "[Reminder] - Remove manager boolean as forward-to renders this redundant"

See merge request fusiondirectory/fd-plugins!1068
Showing with 3 additions and 14 deletions
+3 -14
...@@ -196,12 +196,6 @@ attributetype ( 1.3.6.1.4.1.38414.59.1.32 NAME 'fdTasksReminderSupannNewEndDate' ...@@ -196,12 +196,6 @@ attributetype ( 1.3.6.1.4.1.38414.59.1.32 NAME 'fdTasksReminderSupannNewEndDate'
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.59.1.33 NAME 'fdTasksReminderManager'
DESC 'Allow a given task to be repeatable'
EQUALITY booleanMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX '1.3.6.1.4.1.1466.115.121.1.7')
attributetype ( 1.3.6.1.4.1.38414.59.1.34 NAME 'fdTasksReminderAccountProlongation' attributetype ( 1.3.6.1.4.1.38414.59.1.34 NAME 'fdTasksReminderAccountProlongation'
DESC 'Allow a given task to be repeatable' DESC 'Allow a given task to be repeatable'
EQUALITY booleanMatch EQUALITY booleanMatch
...@@ -214,7 +208,7 @@ attributetype ( 1.3.6.1.4.1.38414.59.1.35 NAME 'fdTasksReminderPosix' ...@@ -214,7 +208,7 @@ attributetype ( 1.3.6.1.4.1.38414.59.1.35 NAME 'fdTasksReminderPosix'
SUBSTR caseIgnoreSubstringsMatch SUBSTR caseIgnoreSubstringsMatch
SYNTAX '1.3.6.1.4.1.1466.115.121.1.7') SYNTAX '1.3.6.1.4.1.1466.115.121.1.7')
attributetype ( 1.3.6.1.4.1.38414.59.1.36 NAME 'fdTasksReminderMembers' attributetype ( 1.3.6.1.4.1.38414.59.1.35 NAME 'fdTasksReminderMembers'
DESC 'Fusion Directory - Following attribute contain the list of members and groups to monitor.' DESC 'Fusion Directory - Following attribute contain the list of members and groups to monitor.'
EQUALITY caseExactMatch EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
...@@ -239,6 +233,6 @@ objectclass ( 1.3.6.1.4.1.38414.59.2.2 NAME 'fdTasksReminder' ...@@ -239,6 +233,6 @@ objectclass ( 1.3.6.1.4.1.38414.59.2.2 NAME 'fdTasksReminder'
SUP top AUXILIARY SUP top AUXILIARY
MUST ( fdTasksReminderFirstCall $ fdTasksReminderMailTemplate $ fdTasksReminderEmailSender $ MUST ( fdTasksReminderFirstCall $ fdTasksReminderMailTemplate $ fdTasksReminderEmailSender $
fdTasksReminderResource $ fdTasksReminderListOfRecipientsMails $ fdTasksReminderMembers) fdTasksReminderResource $ fdTasksReminderListOfRecipientsMails $ fdTasksReminderMembers)
MAY (fdTasksReminderPosix $ fdTasksReminderAccountProlongation $ fdTasksReminderManager $ MAY (fdTasksReminderPosix $ fdTasksReminderAccountProlongation $ fdTasksReminderSupannNewEndDate $
fdTasksReminderSupannNewEndDate $ fdTasksReminderSecondCall $ fdTasksReminderNextSubState $ fdTasksReminderNextState $ fdTasksReminderSecondCall $ fdTasksReminderNextSubState $ fdTasksReminderNextState $
fdTasksReminderNextResource $ fdTasksReminderSubState $ fdTasksReminderState $ fdTasksReminderRecipientsMembers ) ) fdTasksReminderNextResource $ fdTasksReminderSubState $ fdTasksReminderState $ fdTasksReminderRecipientsMembers ) )
...@@ -55,11 +55,6 @@ class taskReminder extends simplePlugin ...@@ -55,11 +55,6 @@ class taskReminder extends simplePlugin
_('First reminder'), _('Numbers of days before reaching resource end date'), _('First reminder'), _('Numbers of days before reaching resource end date'),
'fdTasksReminderFirstCall', TRUE, '0', FALSE, '30' 'fdTasksReminderFirstCall', TRUE, '0', FALSE, '30'
), ),
new BooleanAttribute(
_('Manager'), _('Provide alert to the manager'),
'fdTasksReminderManager', FALSE,
FALSE
),
] ]
], ],
// Attributes are grouped by section // Attributes are grouped by section
......
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