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
ce2d8fe8
Commit
ce2d8fe8
authored
11 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-953: return the site of the right type as the classname of the site is the relevant info
parent
33544baa
No related branches found
Branches containing commit
Tags
OpenOLAT_8.2.0beta
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/course/site/CourseSiteDef.java
+9
-0
9 additions, 0 deletions
src/main/java/org/olat/course/site/CourseSiteDef.java
src/main/java/org/olat/course/site/CourseSiteDef2.java
+10
-0
10 additions, 0 deletions
src/main/java/org/olat/course/site/CourseSiteDef2.java
with
19 additions
and
0 deletions
src/main/java/org/olat/course/site/CourseSiteDef.java
+
9
−
0
View file @
ce2d8fe8
...
...
@@ -98,6 +98,15 @@ public class CourseSiteDef extends AbstractSiteDefinition implements SiteDefinit
return
null
;
}
String
icon
=
courseConfig
.
getNavIconCssClass
();
return
createCourseSiteInstance
(
ureq
,
langConfig
,
showToolController
,
siteSecCallback
,
icon
);
}
/**
* Warning: there is no check against null.
* It's only to return the right type, CourseSie or CourseSite2.
*/
protected
CourseSite
createCourseSiteInstance
(
UserRequest
ureq
,
LanguageConfiguration
langConfig
,
boolean
showToolController
,
SiteSecurityCallback
siteSecCallback
,
String
icon
)
{
return
new
CourseSite
(
this
,
ureq
.
getLocale
(),
langConfig
.
getRepoSoftKey
(),
showToolController
,
siteSecCallback
,
langConfig
.
getTitle
(),
icon
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/olat/course/site/CourseSiteDef2.java
+
10
−
0
View file @
ce2d8fe8
...
...
@@ -20,8 +20,11 @@
package
org.olat.course.site
;
import
org.olat.core.CoreSpringFactory
;
import
org.olat.core.gui.UserRequest
;
import
org.olat.core.gui.control.navigation.SiteDefinitions
;
import
org.olat.core.gui.control.navigation.SiteSecurityCallback
;
import
org.olat.course.site.model.CourseSiteConfiguration
;
import
org.olat.course.site.model.LanguageConfiguration
;
/**
*
...
...
@@ -39,4 +42,11 @@ public class CourseSiteDef2 extends CourseSiteDef {
CourseSiteConfiguration
config
=
siteModule
.
getConfigurationCourseSite2
();
return
config
;
}
@Override
protected
CourseSite
createCourseSiteInstance
(
UserRequest
ureq
,
LanguageConfiguration
langConfig
,
boolean
showToolController
,
SiteSecurityCallback
siteSecCallback
,
String
icon
)
{
return
new
CourseSite2
(
this
,
ureq
.
getLocale
(),
langConfig
.
getRepoSoftKey
(),
showToolController
,
siteSecCallback
,
langConfig
.
getTitle
(),
icon
);
}
}
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