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
a2911d67
"README.md" did not exist on "ca755ca877c1745b14e91e1882e5a5789c8c2701"
Commit
a2911d67
authored
5 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-3887: fix adobe course node upgrader
parent
b69b0488
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/olat/course/nodes/AdobeConnectCourseNode.java
+8
-6
8 additions, 6 deletions
...in/java/org/olat/course/nodes/AdobeConnectCourseNode.java
with
8 additions
and
6 deletions
src/main/java/org/olat/course/nodes/AdobeConnectCourseNode.java
+
8
−
6
View file @
a2911d67
...
...
@@ -41,7 +41,6 @@ import org.olat.course.groupsandrights.CourseGroupManager;
import
org.olat.course.nodes.adobeconnect.AdobeConnectCourseNodeConfiguration
;
import
org.olat.course.nodes.adobeconnect.AdobeConnectEditController
;
import
org.olat.course.nodes.adobeconnect.compatibility.AdobeConnectCompatibilityConfiguration
;
import
org.olat.course.run.environment.CourseEnvironment
;
import
org.olat.course.run.navigation.NodeRunConstructionResult
;
import
org.olat.course.run.userview.NodeEvaluation
;
import
org.olat.course.run.userview.UserCourseEnvironment
;
...
...
@@ -72,7 +71,7 @@ public class AdobeConnectCourseNode extends AbstractAccessableCourseNode {
super
(
TYPE
);
}
private
void
updateModuleConfigDefaults
(
CourseEnvironment
courseEn
v
,
boolean
isNewNode
)
{
private
void
updateModuleConfigDefaults
(
RepositoryEntry
courseEn
try
,
boolean
isNewNode
)
{
ModuleConfiguration
config
=
getModuleConfiguration
();
if
(
config
.
getConfigurationVersion
()
<
2
)
{
Object
oldConfiguration
=
config
.
get
(
CONF_VC_CONFIGURATION
);
...
...
@@ -82,9 +81,8 @@ public class AdobeConnectCourseNode extends AbstractAccessableCourseNode {
config
.
setBooleanEntry
(
AdobeConnectEditController
.
GUEST_ACCESS_ALLOWED
,
oldConfig
.
isGuestAccessAllowed
());
config
.
setBooleanEntry
(
AdobeConnectEditController
.
MODERATOR_START_MEETING
,
!
oldConfig
.
isGuestStartMeetingAllowed
());
if
(
courseEn
v
!=
null
&&
oldConfig
.
getMeetingDatas
()
!=
null
&&
!
oldConfig
.
getMeetingDatas
().
isEmpty
())
{
if
(
courseEn
try
!=
null
&&
oldConfig
.
getMeetingDatas
()
!=
null
&&
!
oldConfig
.
getMeetingDatas
().
isEmpty
())
{
AdobeConnectManager
adobeConnectManager
=
CoreSpringFactory
.
getImpl
(
AdobeConnectManager
.
class
);
RepositoryEntry
courseEntry
=
courseEnv
.
getCourseGroupManager
().
getCourseEntry
();
boolean
hasMeetings
=
adobeConnectManager
.
hasMeetings
(
courseEntry
,
getIdent
(),
null
);
if
(!
hasMeetings
)
{
synchronized
(
this
)
{
// enough
...
...
@@ -106,7 +104,9 @@ public class AdobeConnectCourseNode extends AbstractAccessableCourseNode {
@Override
public
TabbableController
createEditController
(
UserRequest
ureq
,
WindowControl
wControl
,
BreadcrumbPanel
stackPanel
,
ICourse
course
,
UserCourseEnvironment
userCourseEnv
)
{
updateModuleConfigDefaults
(
userCourseEnv
.
getCourseEnvironment
(),
false
);
RepositoryEntry
courseEntry
=
course
.
getCourseEnvironment
()
.
getCourseGroupManager
().
getCourseEntry
();
updateModuleConfigDefaults
(
courseEntry
,
false
);
CourseNode
chosenNode
=
course
.
getEditorTreeModel
().
getCourseNode
(
userCourseEnv
.
getCourseEditorEnv
().
getCurrentCourseNodeId
());
// create edit controller
...
...
@@ -121,7 +121,9 @@ public class AdobeConnectCourseNode extends AbstractAccessableCourseNode {
@Override
public
NodeRunConstructionResult
createNodeRunConstructionResult
(
UserRequest
ureq
,
WindowControl
wControl
,
UserCourseEnvironment
userCourseEnv
,
NodeEvaluation
ne
,
String
nodecmd
)
{
updateModuleConfigDefaults
(
userCourseEnv
.
getCourseEnvironment
(),
false
);
RepositoryEntry
courseEntry
=
userCourseEnv
.
getCourseEnvironment
()
.
getCourseGroupManager
().
getCourseEntry
();
updateModuleConfigDefaults
(
courseEntry
,
false
);
String
providerId
=
getModuleConfiguration
().
getStringValue
(
"vc_provider_id"
);
...
...
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