Skip to content

Commit 243c93e

Browse files
committed
make ready for customfieldsemester
1 parent 308e297 commit 243c93e

File tree

12 files changed

+20
-12
lines changed

12 files changed

+20
-12
lines changed

classes/processor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ public function get_count_of_courses_to_trigger_for_workflow($workflow) {
365365
$obj->excluded = 0;
366366
// Only use triggers with true sql to display the real amounts for the others (instead of always 0).
367367
$obj->sql = trigger_manager::get_trigger_sqlresult($trigger);
368-
$obj->response = $lib->check_course();
368+
$obj->response = $lib->check_course(null, null);
369369
if ($obj->sql != "false") {
370370
if ($obj->response == trigger_response::exclude()) {
371371
// Get courses excluded amount.

lang/de/tool_lifecycle.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
$string['create_step'] = 'Step erstellen';
100100
$string['create_trigger'] = 'Trigger erstellen';
101101
$string['create_workflow_from_existing'] = 'Kopie von bestehendem Workflow erstellen';
102+
$string['customfieldsemesterdescription'] = 'Löst Kurse gemäß dem benutzerdefinierten Kursfeld \'semester\' aus.';
102103
$string['date'] = 'Fällligkeitsdatum';
103104
$string['deactivated'] = 'Deaktiviert';
104105
$string['deactivated_workflows_header'] = 'Inaktive';

lang/en/tool_lifecycle.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
$string['create_step'] = 'Create step';
100100
$string['create_trigger'] = 'Create trigger';
101101
$string['create_workflow_from_existing'] = 'Copy new workflow from existing';
102+
$string['customfieldsemesterdescription'] = 'Trigger courses by the course custom field \'semester\'';
102103
$string['date'] = 'Due date';
103104
$string['deactivated'] = 'Deactivated';
104105
$string['deactivated_workflows_header'] = 'Deactivated';

settings.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,15 @@
7979
if ($trigger == 'sitecourse' || $trigger == 'delayedcourses') {
8080
$uninstall = html_writer::span(' Depracated. Will be removed with version 5.0.', 'text-danger');
8181
}
82-
$settings->add(new admin_setting_description('lifecycletriggersetting_'.$trigger,
83-
get_string('pluginname', 'lifecycletrigger_' . $trigger),
84-
get_string('plugindescription', 'lifecycletrigger_' . $trigger).$uninstall));
82+
if ($trigger == 'customfieldsemester') {
83+
$settings->add(new admin_setting_description('lifecycletriggersetting_'.$trigger,
84+
get_string('pluginname', 'lifecycletrigger_' . $trigger),
85+
get_string('customfieldsemesterdescription', 'tool_lifecycle')));
86+
} else {
87+
$settings->add(new admin_setting_description('lifecycletriggersetting_'.$trigger,
88+
get_string('pluginname', 'lifecycletrigger_' . $trigger),
89+
get_string('plugindescription', 'lifecycletrigger_' . $trigger).$uninstall));
90+
}
8591
}
8692
} else {
8793
$settings->add(new admin_setting_heading('adminsettings_notriggers',

trigger/byrole/lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function get_course_recordset_where($triggerid) {
6060
* @param int $triggerid DEPRECATED
6161
* @return trigger_response
6262
*/
63-
public function check_course($course = null, $triggerid = null) {
63+
public function check_course($course, $triggerid) {
6464
return trigger_response::trigger();
6565
}
6666

trigger/categories/lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class categories extends base_automatic {
4747
* @param int $triggerid DEPRECATED
4848
* @return trigger_response
4949
*/
50-
public function check_course($course = null, $triggerid = null) {
50+
public function check_course($course, $triggerid) {
5151
return trigger_response::trigger();
5252
}
5353

trigger/delayedcourses/lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class delayedcourses extends base_automatic {
4444
* @param int $triggerid DEPRECATED
4545
* @return trigger_response
4646
*/
47-
public function check_course($course = null, $triggerid = null) {
47+
public function check_course($course, $triggerid) {
4848
return trigger_response::exclude();
4949
}
5050

trigger/lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ abstract class base_automatic extends base {
143143
* @param int $triggerid DEPRECATED
144144
* @return trigger_response
145145
*/
146-
abstract public function check_course($course = null, $triggerid = null);
146+
abstract public function check_course($course, $triggerid);
147147

148148
/**
149149
* Defines if the trigger subplugin is started manually or automatically.

trigger/semindependent/lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class semindependent extends base_automatic {
4545
* @param int $triggerid DEPRECATED
4646
* @return trigger_response
4747
*/
48-
public function check_course($course = null, $triggerid = null) {
48+
public function check_course($course, $triggerid) {
4949
return trigger_response::trigger();
5050
}
5151

trigger/sitecourse/lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class sitecourse extends base_automatic {
4242
* @param int $triggerid DEPRECATED
4343
* @return trigger_response
4444
*/
45-
public function check_course($course = null, $triggerid = null) {
45+
public function check_course($course, $triggerid) {
4646
return trigger_response::trigger();
4747
}
4848

trigger/specificdate/lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class specificdate extends base_automatic {
4747
* @param int $triggerid DEPRECATED
4848
* @return trigger_response
4949
*/
50-
public function check_course($course = null, $triggerid = null) {
50+
public function check_course($course, $triggerid) {
5151
return trigger_response::triggertime();
5252
}
5353

trigger/startdatedelay/lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class startdatedelay extends base_automatic {
4545
* @param int $triggerid DEPRECATED
4646
* @return trigger_response
4747
*/
48-
public function check_course($course = null, $triggerid = null) {
48+
public function check_course($course, $triggerid) {
4949
return trigger_response::trigger();
5050
}
5151

0 commit comments

Comments
 (0)