Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ILIAS 7 Course/Group: Add new setting (additional feature) to define a subjec… #2965

Merged
merged 2 commits into from
Nov 6, 2020
+25 −4
Merged

ILIAS 7 Course/Group: Add new setting (additional feature) to define a subjec… #2965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef0c60a
Course/Group: Add new setting (additional feature) to define a subjec…
mjansenDatabay Oct 28, 2020
f39360d
Course/Group: Add new setting (additional feature) to define a subjec…
mjansenDatabay Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Modules/Course/classes/class.ilObjCourseGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,8 @@ public function updateObject()
ilObjectServiceSettingsGUI::BADGES,
ilObjectServiceSettingsGUI::ORGU_POSITION_ACCESS,
ilObjectServiceSettingsGUI::SKILLS,
ilObjectServiceSettingsGUI::BOOKING
ilObjectServiceSettingsGUI::BOOKING,
ilObjectServiceSettingsGUI::EXTERNAL_MAIL_PREFIX
)
);

Expand Down Expand Up @@ -1483,7 +1484,8 @@ protected function initEditForm()
ilObjectServiceSettingsGUI::BADGES,
ilObjectServiceSettingsGUI::ORGU_POSITION_ACCESS,
ilObjectServiceSettingsGUI::SKILLS,
ilObjectServiceSettingsGUI::BOOKING
ilObjectServiceSettingsGUI::BOOKING,
ilObjectServiceSettingsGUI::EXTERNAL_MAIL_PREFIX
)
);

Expand Down
6 changes: 4 additions & 2 deletions Modules/Group/classes/class.ilObjGroupGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,8 @@ public function updateObject()
ilObjectServiceSettingsGUI::TAG_CLOUD,
ilObjectServiceSettingsGUI::BADGES,
ilObjectServiceSettingsGUI::SKILLS,
ilObjectServiceSettingsGUI::ORGU_POSITION_ACCESS
ilObjectServiceSettingsGUI::ORGU_POSITION_ACCESS,
ilObjectServiceSettingsGUI::EXTERNAL_MAIL_PREFIX
)
);

Expand Down Expand Up @@ -1755,7 +1756,8 @@ public function initForm($a_mode = 'edit', $a_omit_form_action = false)
ilObjectServiceSettingsGUI::TAG_CLOUD,
ilObjectServiceSettingsGUI::BADGES,
ilObjectServiceSettingsGUI::SKILLS,
ilObjectServiceSettingsGUI::ORGU_POSITION_ACCESS
ilObjectServiceSettingsGUI::ORGU_POSITION_ACCESS,
ilObjectServiceSettingsGUI::EXTERNAL_MAIL_PREFIX
)
);

Expand Down
13 changes: 13 additions & 0 deletions Services/Object/classes/class.ilObjectServiceSettingsGUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class ilObjectServiceSettingsGUI
const SKILLS = 'cont_skills';
const FILTER = 'filter';
const BOOKING = 'cont_bookings';
public const EXTERNAL_MAIL_PREFIX = 'mail_external_prefix';

private $gui = null;
private $modes = array();
Expand Down Expand Up @@ -307,6 +308,14 @@ public static function initServiceSettingsForm($a_obj_id, ilPropertyFormGUI $for
$form->addItem($book);
}

if (in_array(self::EXTERNAL_MAIL_PREFIX, $services)) {
$externalMailPrefix = new ilTextInputGUI($lng->txt('obj_tool_ext_mail_subject_prefix'), self::EXTERNAL_MAIL_PREFIX);
$externalMailPrefix->setMaxLength(255);
$externalMailPrefix->setInfo($lng->txt('obj_tool_ext_mail_subject_prefix_info'));
$externalMailPrefix->setValue(ilContainer::_lookupContainerSetting($a_obj_id, self::EXTERNAL_MAIL_PREFIX, ''));
$form->addItem($externalMailPrefix);
}

return $form;
}

Expand Down Expand Up @@ -424,6 +433,10 @@ public static function updateServiceSettingsForm($a_obj_id, ilPropertyFormGUI $f
ilContainer::_writeContainerSetting($a_obj_id, "filter_show_empty", (int) $form->getInput("filter_show_empty"));
}

if (in_array(self::EXTERNAL_MAIL_PREFIX, $services)) {
ilContainer::_writeContainerSetting($a_obj_id, self::EXTERNAL_MAIL_PREFIX, $form->getInput(self::EXTERNAL_MAIL_PREFIX));
}

return true;
}

Expand Down
2 changes: 2 additions & 0 deletions lang/ilias_de.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13836,6 +13836,8 @@ badge#:#badge_user_profile#:#Benutzerprofil
badge#:#badge_badge#:#Badge
obj#:#obj_tool_setting_badges#:#Badges
obj#:#obj_tool_setting_badges_info#:#Wenn aktiviert können Badges konfiguriert werden.
obj#:#obj_tool_ext_mail_subject_prefix#:#E-Mail-Betreff Prefix
obj#:#obj_tool_ext_mail_subject_prefix_info#:#Tragen Sie hier einen kurzen Text ein, der in die Betreffzeile von externen E-Mails in den Betreff aufgenommen wird. Dies erleichtert das Identifizieren von E-Mails aus unterschiedlichen Bereichen.
badge#:#badge_add_template#:#Template hinzufügen
badge#:#badge_image_template_form#:#Bildvorlage
badge#:#badge_image_from_upload#:#Bild hochlanden
Expand Down
2 changes: 2 additions & 0 deletions lang/ilias_en.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13820,6 +13820,8 @@ badge#:#badge_user_profile#:#User Profil
badge#:#badge_badge#:#Badge
obj#:#obj_tool_setting_badges#:#Badges
obj#:#obj_tool_setting_badges_info#:#Activates badge management and badge assignments to members.
obj#:#obj_tool_ext_mail_subject_prefix#:#Mail Subject Prefix
obj#:#obj_tool_ext_mail_subject_prefix_info#:#Enter a short text that is added to the subject line of external mails send to members to make identifying these mails easier.
badge#:#badge_add_template#:#Add Template
badge#:#badge_image_template_form#:#Image Template
badge#:#badge_image_from_upload#:#Upload Image
Expand Down