Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
4afb9903
Commit
4afb9903
authored
8 years ago
by
lmihalkovic
Browse files
Options
Downloads
Patches
Plain Diff
OO-2007: reusing membership fragment (the fragment code was extracted here)
parent
927020e8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/course/nodes/co/COConfigForm.java
+78
-462
78 additions, 462 deletions
src/main/java/org/olat/course/nodes/co/COConfigForm.java
src/main/java/org/olat/course/nodes/co/COEditController.java
+27
-24
27 additions, 24 deletions
src/main/java/org/olat/course/nodes/co/COEditController.java
with
105 additions
and
486 deletions
src/main/java/org/olat/course/nodes/co/COConfigForm.java
+
78
−
462
View file @
4afb9903
This diff is collapsed.
Click to expand it.
src/main/java/org/olat/course/nodes/co/COEditController.java
+
27
−
24
View file @
4afb9903
...
@@ -40,6 +40,7 @@ import org.olat.course.assessment.AssessmentHelper;
...
@@ -40,6 +40,7 @@ import org.olat.course.assessment.AssessmentHelper;
import
org.olat.course.condition.Condition
;
import
org.olat.course.condition.Condition
;
import
org.olat.course.condition.ConditionEditController
;
import
org.olat.course.condition.ConditionEditController
;
import
org.olat.course.editor.NodeEditController
;
import
org.olat.course.editor.NodeEditController
;
import
org.olat.course.editor.formfragments.MembersSelectorFormFragment
;
import
org.olat.course.nodes.COCourseNode
;
import
org.olat.course.nodes.COCourseNode
;
import
org.olat.course.run.userview.UserCourseEnvironment
;
import
org.olat.course.run.userview.UserCourseEnvironment
;
import
org.olat.modules.ModuleConfiguration
;
import
org.olat.modules.ModuleConfiguration
;
...
@@ -65,29 +66,29 @@ public class COEditController extends ActivateableTabbableDefaultController impl
...
@@ -65,29 +66,29 @@ public class COEditController extends ActivateableTabbableDefaultController impl
public
static
final
String
CONFIG_KEY_EMAILTOGROUPS
=
"emailToGroups"
;
public
static
final
String
CONFIG_KEY_EMAILTOGROUPS
=
"emailToGroups"
;
/** config key: to email addresses to be extracted from specified learn areas */
/** config key: to email addresses to be extracted from specified learn areas */
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_AREA
=
"emailTo
AreaCoaches"
;
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_AREA
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_COACHES_AREA
;
/** config key: to email addresses to be extracted from specified learn areas */
/** config key: to email addresses to be extracted from specified learn areas */
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_AREA_IDS
=
"emailTo
AreaCoachesIds"
;
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_AREA_IDS
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_COACHES_AREA_IDS
;
/** config key: keys of the course participants list */
/** config key: keys of the course participants list */
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_ALL
=
"emailTo
ParticipantsAll"
;
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_ALL
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_PARTICIPANTS_ALL
;
/** config key: keys of the group participants list */
/** config key: keys of the group participants list */
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_GROUP_ID
=
"emailTo
GroupParticipantsIds"
;
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_GROUP_ID
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_PARTICIPANTS_GROUP_ID
;
/** config key: email goes to group participants */
/** config key: email goes to group participants */
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_GROUP
=
"emailTo
GroupParticipants"
;
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_GROUP
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_PARTICIPANTS_GROUP
;
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_AREA_ID
=
"emailTo
AreaParticipantsIds"
;
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_AREA_ID
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_PARTICIPANTS_AREA_ID
;
/** config key: email goes to group participants */
/** config key: email goes to group participants */
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_AREA
=
"emailTo
AreaParticipants"
;
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_AREA
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_PARTICIPANTS_AREA
;
/** config key: email goes to course participants */
/** config key: email goes to course participants */
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_COURSE
=
"emailTo
CourseParticipants"
;
public
static
final
String
CONFIG_KEY_EMAILTOPARTICIPANTS_COURSE
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_PARTICIPANTS_COURSE
;
/** config key: email goes to group coaches */
/** config key: email goes to group coaches */
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_GROUP
=
"emailTo
GroupCoaches"
;
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_GROUP
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_COACHES_GROUP
;
/** config key: key of the group coaches list */
/** config key: key of the group coaches list */
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_GROUP_ID
=
"emailTo
GroupCoachesIds"
;
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_GROUP_ID
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_COACHES_GROUP_ID
;
/** config key: key of the course coaches list */
/** config key: key of the course coaches list */
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_ALL
=
"emailto
CoachesAll"
;
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_ALL
=
"emailto
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_COACHES_ALL
;
/** config key: email goes to course coaches */
/** config key: email goes to course coaches */
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_COURSE
=
"emailTo
CourseCoaches"
;
public
static
final
String
CONFIG_KEY_EMAILTOCOACHES_COURSE
=
"emailTo
"
+
MembersSelectorFormFragment
.
CONFIG_KEY_COACHES_COURSE
;
/** config key: email goes to course owners */
/** config key: email goes to course owners */
public
static
final
String
CONFIG_KEY_EMAILTOOWNERS
=
"emailToOwners"
;
public
static
final
String
CONFIG_KEY_EMAILTOOWNERS
=
"emailToOwners"
;
/** config key: email goes to email address */
/** config key: email goes to email address */
...
@@ -162,19 +163,21 @@ public class COEditController extends ActivateableTabbableDefaultController impl
...
@@ -162,19 +163,21 @@ public class COEditController extends ActivateableTabbableDefaultController impl
if
(
event
==
Event
.
CANCELLED_EVENT
)
{
if
(
event
==
Event
.
CANCELLED_EVENT
)
{
return
;
return
;
}
else
if
(
event
==
Event
.
DONE_EVENT
)
{
}
else
if
(
event
==
Event
.
DONE_EVENT
)
{
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOCOACHES_GROUP
,
configForm
.
getEmailGroupCoaches
());
this
.
configForm
.
storeFormData
(
ureq
);
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOCOACHES_AREA
,
configForm
.
getEmailCoachesAreas
());
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOCOACHES_GROUP_ID
,
configForm
.
getEmailGroupCoachesIds
());
// moduleConfiguration.set(CONFIG_KEY_EMAILTOCOACHES_GROUP, configForm.getEmailGroupCoaches());
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOCOACHES_AREA_IDS
,
configForm
.
getEmailCoachesAreaIds
());
// moduleConfiguration.set(CONFIG_KEY_EMAILTOCOACHES_AREA, configForm.getEmailCoachesAreas());
moduleConfiguration
.
setBooleanEntry
(
CONFIG_KEY_EMAILTOCOACHES_ALL
,
configForm
.
sendToCoachesAll
());
// moduleConfiguration.set(CONFIG_KEY_EMAILTOCOACHES_GROUP_ID, configForm.getEmailGroupCoachesIds());
moduleConfiguration
.
setBooleanEntry
(
CONFIG_KEY_EMAILTOCOACHES_COURSE
,
configForm
.
sendToCoachesCourse
());
// moduleConfiguration.set(CONFIG_KEY_EMAILTOCOACHES_AREA_IDS, configForm.getEmailCoachesAreaIds());
// moduleConfiguration.setBooleanEntry(CONFIG_KEY_EMAILTOCOACHES_ALL, configForm.sendToCoachesAll());
// moduleConfiguration.setBooleanEntry(CONFIG_KEY_EMAILTOCOACHES_COURSE, configForm.sendToCoachesCourse());
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOPARTICIPANTS_GROUP
,
configForm
.
getEmailGroupParticipants
());
//
moduleConfiguration.set(CONFIG_KEY_EMAILTOPARTICIPANTS_GROUP, configForm.getEmailGroupParticipants());
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOPARTICIPANTS_GROUP_ID
,
configForm
.
getEmailGroupParticipantsIds
());
//
moduleConfiguration.set(CONFIG_KEY_EMAILTOPARTICIPANTS_GROUP_ID, configForm.getEmailGroupParticipantsIds());
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOPARTICIPANTS_AREA
,
configForm
.
getEmailParticipantsAreas
());
//
moduleConfiguration.set(CONFIG_KEY_EMAILTOPARTICIPANTS_AREA, configForm.getEmailParticipantsAreas());
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOPARTICIPANTS_AREA_ID
,
configForm
.
getEmailParticipantsAreaIds
());
//
moduleConfiguration.set(CONFIG_KEY_EMAILTOPARTICIPANTS_AREA_ID, configForm.getEmailParticipantsAreaIds());
moduleConfiguration
.
setBooleanEntry
(
CONFIG_KEY_EMAILTOPARTICIPANTS_COURSE
,
configForm
.
sendToParticipantsCourse
());
//
moduleConfiguration.setBooleanEntry(CONFIG_KEY_EMAILTOPARTICIPANTS_COURSE, configForm.sendToParticipantsCourse());
moduleConfiguration
.
setBooleanEntry
(
CONFIG_KEY_EMAILTOPARTICIPANTS_ALL
,
configForm
.
sendToParticipantsAll
());
//
moduleConfiguration.setBooleanEntry(CONFIG_KEY_EMAILTOPARTICIPANTS_ALL, configForm.sendToParticipantsAll());
moduleConfiguration
.
setBooleanEntry
(
CONFIG_KEY_EMAILTOOWNERS
,
configForm
.
sendToOwners
());
moduleConfiguration
.
setBooleanEntry
(
CONFIG_KEY_EMAILTOOWNERS
,
configForm
.
sendToOwners
());
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOADRESSES
,
configForm
.
getEmailList
());
moduleConfiguration
.
set
(
CONFIG_KEY_EMAILTOADRESSES
,
configForm
.
getEmailList
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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